Skip to content

Instantly share code, notes, and snippets.

@mattfenwick

mattfenwick/recipes.md

Created April 1, 2016 19:00
Show Gist options
  • Save mattfenwick/233bebfd8768e485841a4343098411df to your computer and use it in GitHub Desktop.
Save mattfenwick/233bebfd8768e485841a4343098411df to your computer and use it in GitHub Desktop.
Download ZIP
git recipes
Raw
recipes.md

Merges

Use diff3 conflict markers

$ git config --global merge.conflictstyle diff3

Show the diffs that introduced a conflict

$ git log -p --oneline --left-right --merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment