Changes between Version 36 and Version 37 of DevelopmentProcedure
- Timestamp:
- 05/02/14 10:28:52 (11 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
DevelopmentProcedure
v36 v37 17 17 git checkout -b ticket_353 development 18 18 }}} 19 1. Then setup your branch to synchronize with the central repository.19 1. Then you can setup your branch to synchronize with the central repository. 20 20 {{{ 21 21 git push -u origin ticket_353 22 22 }}} 23 This will allow you to push commits to your local branch to the central repo for others to see and/or use. 24 23 25 1. You can then modify code as necessary and then use git add to add any file changes to your next commit 24 26 {{{ … … 35 37 1. You can repeat steps 6-8 as many times as you want until the feature is complete. Then please notify [mailto:astrobear_dev@pas.rochester.edu] and we will merge your changes into the development branch and the next release. 36 38 39 == Merging == 40 41 1. To merge 1 branch into another (ie ticket_353 into development) you would do the following 42 {{{ 43 git checkout development 44 git merge ticket_353 45 }}} 46 1. If there are conflicts you will have to resolve the conflicts, add the conflicted files and commit the merge. 47 {{{ 48 git add conflicted_file.f90 49 git commit -m 'merged ticket_353 into development' 50 git push 51 }}} 52 1. You can then delete the local branch 53 {{{ 54 git branch -d ticket_353 55 }}} 56 1. as well as the branch on the central server. 57 {{{ 58 git push origin :ticket_353 59 }}} 37 60 38 61 [[CollapsibleStart(Previous Procedure)]]
