Skip to content
a simple git conflict resolution tutorial
Fetching latest commit…
Cannot retrieve the latest commit at this time.
Failed to load latest commit information.
README.md
handling_version_conflicts_with_git.key
handling_version_conflicts_with_git.pdf
pancakes.md

README.md

To trigger the merge conflict:

git checkout master
git merge no_lemons

output will be something like:

Auto-merging pancakes.md
CONFLICT (content): Merge conflict in pancakes.md
Automatic merge failed; fix conflicts and then commit the result.

now you can either:

  • (recommended) edit the file manually, save the finished version, then git commit
  • use git mergetool (can be confusing, especially on Mac)

It may be helpful to say something about how/why you resolved the conflict in your merge conflict commit message.

Recipe adapted from Delia Smith.

Something went wrong with that request. Please try again.