Changes between Version 13 and Version 14 of Developer/Git/Committers
- Timestamp:
- 03/30/12 03:44:01 (12 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Developer/Git/Committers
v13 v14 161 161 }}} 162 162 If someone pushed since you updated the server rejects your push until you are up to date. 163 164 For example a workflow where you will commit a series of patches from ../patches/am/ directory: 165 {{{ 166 # git co -b am 167 # git am ../patches/am* 168 # git pull --rebase upstream master 169 # git push upstream am:master 170 # git co master 171 # git pull upstream master 172 # git log 173 # git branch -d am 174 # git push 175 }}} 176 The git log stage will show your newly pushed patches if everything worked properly, and you can delete the am branch created. The git push at the end will push the changes up to your personal repository. 163 177 = Ooops! = 164 178