Warning: Can't synchronize with repository "(default)" (/home/git/ome.git does not appear to be a Git repository.). Look in the Trac log for more information.
- Timestamp:
-
04/05/11 16:03:08 (13 years ago)
- Author:
-
wmoore
- Comment:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
-
|
v1
|
v2
|
|
| 44 | 44 | |
| 45 | 45 | 3. Upon review completion, the merge (with history; --no-ff) of all changes into develop. |
| | 46 | {{{ |
| | 47 | git fetch |
| | 48 | git checkout python-gateway |
| | 49 | git rebase origin/python-gateway |
| | 50 | git checkout develop |
| | 51 | git rebase origin/develop |
| | 52 | git merge —no-ff —log python-gateway |
| | 53 | git commit --amend |
| | 54 | git push origin develop |
| | 55 | }}} |
| | 56 | |
| | 57 | In order to keep the python-develop branch up to date with develop, Chris or Josh needs to do this on origin, then everyone has to do |
| | 58 | {{{ |
| | 59 | git checkout python-gateway |
| | 60 | git reset —hard origin/python-gatewa |
| | 61 | }}} |
| 46 | 62 | 4. Merge and/or cherry-pick of changes into 4.1, 4.2 and/or 4.1_custom by Carlos, Josh or Chris. |
1.3.13-PRO © 2008-2011
Agilo Software all
rights reserved
(this page was served in: 0.12799 sec.)
