Changes between Version 34 and Version 35 of CollaborateOnGithub
- Timestamp:
- Jan 12, 2010, 10:44:16 AM (15 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
CollaborateOnGithub
v34 v35 138 138 git checkout ticket1234 139 139 }}} 140 1. Merge , fix any conflicts140 1. Merge 141 141 {{{ 142 142 git merge master 143 }}} 144 1. If there were any conflicts, handle them by fixing the corresponding files, mark the files as fixed by re-adding them and commit 145 {{{ 146 git add file/that/was/fixed.py 147 git commit 143 148 }}} 144 149 1. [wiki:RunningDjangoTests Run tests]