Changes between Version 24 and Version 25 of CollaborateOnGithub


Ignore:
Timestamp:
10/08/09 17:09:42 (5 years ago)
Author:
mrts
Comment:

When something goes wrong...

Legend:

Unmodified
Added
Removed
Modified
  • CollaborateOnGithub

    v24 v25  
    151151 }}}
    152152
     153=== If something went wrong ===
     154
     155The following may wreak havoc if someone has forked your branches. If not, it should be relatively safe.
     156
     157==== On `master` ====
     158
     159You can reset `master` to a one-to-one copy of `upstream` as follows:
     160{{{
     161git reset --hard upstream/master
     162git push --force
     163}}}
     164
     165==== On a branch ====
     166
     167You can manually remove or glue commits together with
     168{{{
     169git rebase -i master
     170}}}
     171
     172To abort the rebase, just remove all non-commented lines.
     173
     174You may need to use `--force` to push changes back to !GitHub
     175{{{
     176git push --force
     177}}}
     178
     179If something went wrong during rebase and you want to undo the rebase:
     180
     181 1. Find out the state identifier before the rebase:
     182 {{{
     183git reflog
     184 }}}
     185 1. Switch back to that state
     186 {{{
     187git reset --hard HEAD@{NUMBER_FROM_REFLOG_HERE}
     188 }}}
     189
    153190== Collaboration on a large feature ==
    154191
     
    158195 * ''Contributors'' are developers who contribute -- under lieutenant's guidance -- to the development of the feature.
    159196
    160 ''The workflow described below should usually use a separate branch to the keep work isolated, so the instructions need updating.''
     197''The workflow described below should usually use a separate branch to keep the work isolated, so the instructions need updating.''
    161198
    162199=== Lieutenant ===
Back to Top