Changes between Version 4 and Version 5 of GitUsage

Timestamp:

12/05/10 12:55:37 (9 years ago)

Author:

magnate

Comment:

--

GitUsage

@@ -24 +24 @@
 This typically happens when you're engrossed in working on your commit and haven't noticed that someone else has pushed an update to the branch you're working on in the meantime. So you finish testing your work, commit it and to 'git push remotename branchname', only to get told 
 
-{{{To git@github.com:angband/angband.git
+{{{
+To git@github.com:angband/angband.git
  ! [rejected]        staging -> staging (non-fast-forward)
 error: failed to push some refs to 'git@github.com:angband/angband.git'
 To prevent you from losing history, non-fast-forward updates were rejected
 Merge the remote changes (e.g. 'git pull') before pushing again.  See the
-'Note about fast-forwards' section of 'git push --help' for details.}}}
+'Note about fast-forwards' section of 'git push --help' for details.
+}}}
 
 Argh. You don't want to lose your changes, but you also don't want to do a non-fast-forward merge and risk the wrath of takk ... so try this: 
 
-{{{git fetch remotename
+{{{
+git fetch remotename
 git checkout remotename/branchname
 git checkout -b newbranch
 git cherry-pick your-commit-id
-git push remotename newbranch:branchname}}}
+git push remotename newbranch:branchname
+}}}
 
 That creates a new copy of the branch you're tracking, adds your commit without recursing, and pushes it upstream as if you'd done it right in the first place. All that's left is to tidy up your local repo: delete both the old messed-up branch with the right name and the new branch with the wrong name, and re-create the properly-named branch to track the remote one.