I'm stuck in a merge conflict

Recovery steps

1. 1

   See which files are in conflict

   Look for “both modified”.

   Safe

   $ git status
   $ git diff --name-only --diff-filter=U

2. 2

   Panic button: cancel everything

   Back to the state before the merge or rebase started.

   Safe

   $ git merge --abort
   # or, during a rebase:
   $ git rebase --abort

3. 3

   Take one side for a whole file

   Only when you are sure one version is right. During a rebase, “ours” and “theirs” are swapped.

   Caution

   $ git checkout --ours path/to/file
   # or
   $ git checkout --theirs path/to/file

4. 4

   Mark as resolved and finish

   After editing the files and removing every marker.

   Safe

   $ git add path/to/file
   $ git commit
   # or, during a rebase:
   $ git rebase --continue

These procedures are provided for information only. Read each command and adapt it to your situation before running it. Disclaimer

Other disasters