Changes between Version 4 and Version 5 of drm4gDevelopment


Ignore:
Timestamp:
Dec 12, 2016 3:56:31 PM (6 years ago)
Author:
minondoa
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • drm4gDevelopment

    v4 v5  
    33If you want to contribute to this repository please be aware that this project uses a gitflowworkflow with the next release branch called next.
    44Please fork this repository and create a local branch split off of the next branch and create pull requests back to the origin next branch.
    5 }}}
    6 
    75
    86{{{#!Workflow width=700 height=300
     
    2321reopen.operations = del_resolution
    2422}}}
     23}}}
    2524
    2625= Development =
     
    3231it has been uploaded to !GitHub.
    3332}}}
    34  You can find the project [[https://github.com/SantanderMetGroup/DRM4G|here]].
     33* You can find the project [[https://github.com/SantanderMetGroup/DRM4G|here]].
    3534
    3635
     
    3837For those of you who wish to help but don't know how, the  first thing you need is a [[https://github.com/join?source=header-home|GitHub account]].
    3938
    40 Go to our projects page.[[BR]]
    41 Hit the fork button at the top right side --image of fork button--[[BR]]
     39In our project's page hit the "'''''Fork'''''" button at the top right corner:
    4240
    43 There are a lot of tutorials showing how to use git, including [[wiki:versionControl/git|our own]], but here is a more specific one, a simple step by step explanation on how to start using it to help us improve DRM4G.
     41[[Image(fork button2.png)]]
    4442
    45 In Linux:
    46 * Open a terminal on the folder in which you wish your local copy of the repository to be stored (it's recommended to use an empty folder)
    47 * git init
    48 * git remote add origin <your_repository_url>
    49  * you can get the url by clicking on the "Clone or download" button
    50   * it will look something like this: .....
    51 * git remote add origin <your_repository_url>
    52 * git pull origin master
     43This will create a copy of our repository in your account where you'll develop your own feature or implement a bugfix that you may believe is necessary. You'll be submitting changes to this one until you are certain everything works properly, at which point you can request to have your changes integrated into the DRM4G's repository.
     44
     45To continue, you'll need to setup a local repository where you'll be changing the code and doing your testing. To do this you'll need your repository URL, that can be obtained adding '''.git''' to your project page or by clicking on the "'''''Clone or download'''''" button:
     46
     47
     48[[Image(clone_button.png)]]
     49
     50
     51In Linux operating systems:
     52* Open a terminal on the folder in which you wish your local copy of the repository to be stored (it's recommended to use an empty folder) and run the following commands:
     53
     54{{{#!sh
     55git init  #to initialize an empty Git repository
     56git remote add origin <your_repository_url> #to make your local repository point to your remote repository in GitHub
     57git checkout develop #to create a local copy of the develop branch
     58}}}
     59
     60To be consistent with our [wiki:DRM4G/Development#OurGitworkflow gitflow], all you'll be able to do is create '''feature or bugfix branches''', and you'll have to follow our naming conventions to do so.
     61* The naming convention will just be to create branches in lower case letters separated by underscores ("'''_'''") that describe what you're trying to accomplish with the branch.
    5362
    5463With this, you will now have DRM4G's source code at your disposal.
    5564
     65There are a lot of tutorials showing how to use git, including [[wiki:versionControl/git|our own]], but here is a more specific one, a simple step by step explanation on how to start using it to help us improve DRM4G.
    5666
    5767From here you could create branches for every new feature you'd like to include to the DRM4G, for a more in depth tutorial on how to do that, click [[https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging|here]].
     
    97107git add .
    98108git commit -m "Description of the changes you've made"
    99 git push -u origin master #just the first time, the following times just run "git push origin master"
     109git push origin develop
    100110}}}
     111{{{#!comment
     112Creo que esto ya no hace falta, al hacer el "git checkout" ya se empieza a monitorizar la rama remota
     113git push -u origin develop #just the first time, the following times just run "git push origin develop"
     114}}}
     115
    101116
    102117From here you'll have to create a '''Pull request'''.