Changes between Version 26 and Version 27 of CollaborateOnGithub

Timestamp:

Oct 8, 2009, 5:23:03 PM (15 years ago)

Author:

mrts

Comment:

--

CollaborateOnGithub

@@ -172 +172 @@
 To abort the rebase, just remove all non-commented lines.
 
-You may need to use `--force` to push changes back to !GitHub
+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}
+ }}}
+
+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
 {{{
 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}
- }}}
-
-This works for all other similar problems as well, e.g. for backing out a merge.
 
 == Collaboration on a large feature ==