Changes between Version 30 and Version 31 of CollaborateOnGithub

Timestamp:

Oct 17, 2009, 3:49:50 AM (15 years ago)

Author:

mrts

Comment:

--

CollaborateOnGithub

@@ -167 +167 @@
 === If something went wrong ===
 
-The following may wreak havoc if someone has forked your branches. If not, it should be relatively safe.
+If you haven't done anything out of the ordinary, but see
+{{{
+$ git push
+...
+! [rejected]        master -> master (non-fast forward)
+...
+}}}
+then most likely your branch (`master` in this case) is out of sync with the remote branch.
+{{{
+git pull
+}}}
+should alleviate the problem and `git push` should work again.
+
+Generally, `non-fast forward` means that the local history differs from the remote history and pushing would change remote history.
+Although rewriting history may wreak havoc if someone has forked your repository after the changed point, it is sometimes necessary.
 
 ==== On `master` ====
@@ -175 +189 @@
 git checkout master
 git reset --hard upstream/master
+}}}
+
+If the reset changes history, you'll get the `non-fast forward` error when doing a `git push`. A forced push is required in this case:
+{{{
 git push --force
 }}}
@@ -205 +223 @@
 This works for all other similar problems as well, e.g. for backing out a merge.
 
-You will probably need to use `--force` to push changes back to !GitHub
+As above, if you've changed history, you need to issue a forced push:
 {{{
 git push --force