Changes between Version 24 and Version 25 of CollaborateOnGithub

Timestamp:

Oct 8, 2009, 5:09:42 PM (16 years ago)

Author:

mrts

Comment:

When something goes wrong...

CollaborateOnGithub

@@ -151 +151 @@
  }}}
 
+=== If something went wrong ===
+
+The following may wreak havoc if someone has forked your branches. If not, it should be relatively safe.
+
+==== On `master` ====
+
+You can reset `master` to a one-to-one copy of `upstream` as follows:
+{{{
+git reset --hard upstream/master
+git push --force
+}}}
+
+==== On a branch ====
+
+You can manually remove or glue commits together with
+{{{
+git rebase -i master
+}}}
+
+To abort the rebase, just remove all non-commented lines.
+
+You may need to use `--force` to push changes back to !GitHub
+{{{
+git push --force
+}}}
+
+If something went wrong during rebase and you want to undo the rebase:
+
+ 1. Find out the state identifier before the rebase:
+ {{{
+git reflog
+ }}}
+ 1. Switch back to that state
+ {{{
+git reset --hard HEAD@{NUMBER_FROM_REFLOG_HERE}
+ }}}
+
 == Collaboration on a large feature ==
 
@@ -158 +195 @@
  * ''Contributors'' are developers who contribute -- under lieutenant's guidance -- to the development of the feature.
 
-''The workflow described below should usually use a separate branch to the keep work isolated, so the instructions need updating.''
+''The workflow described below should usually use a separate branch to keep the work isolated, so the instructions need updating.''
 
 === Lieutenant ===