Changes between Version 4 and Version 5 of drm4gDevelopment
- Timestamp:
- Dec 12, 2016 3:56:31 PM (5 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
drm4gDevelopment
v4 v5 3 3 If you want to contribute to this repository please be aware that this project uses a gitflowworkflow with the next release branch called next. 4 4 Please 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 7 5 8 6 {{{#!Workflow width=700 height=300 … … 23 21 reopen.operations = del_resolution 24 22 }}} 23 }}} 25 24 26 25 = Development = … … 32 31 it has been uploaded to !GitHub. 33 32 }}} 34 You can find the project [[https://github.com/SantanderMetGroup/DRM4G|here]].33 * You can find the project [[https://github.com/SantanderMetGroup/DRM4G|here]]. 35 34 36 35 … … 38 37 For 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]]. 39 38 40 Go to our projects page.[[BR]] 41 Hit the fork button at the top right side --image of fork button--[[BR]] 39 In our project's page hit the "'''''Fork'''''" button at the top right corner: 42 40 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)]] 44 42 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 43 This 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 45 To 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 51 In 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 55 git init #to initialize an empty Git repository 56 git remote add origin <your_repository_url> #to make your local repository point to your remote repository in GitHub 57 git checkout develop #to create a local copy of the develop branch 58 }}} 59 60 To 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. 53 62 54 63 With this, you will now have DRM4G's source code at your disposal. 55 64 65 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. 56 66 57 67 From 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]]. … … 97 107 git add . 98 108 git 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"109 git push origin develop 100 110 }}} 111 {{{#!comment 112 Creo que esto ya no hace falta, al hacer el "git checkout" ya se empieza a monitorizar la rama remota 113 git push -u origin develop #just the first time, the following times just run "git push origin develop" 114 }}} 115 101 116 102 117 From here you'll have to create a '''Pull request'''.
