Navigation Menu

Skip to content

Instantly share code, notes, and snippets.

@thephw

thephw/merge_tool_basics.sh

Created January 18, 2016 19:58
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save thephw/3bb1cbc75a2b54dea5d0 to your computer and use it in GitHub Desktop.
Save thephw/3bb1cbc75a2b54dea5d0 to your computer and use it in GitHub Desktop.
Download ZIP
Please use your merge tool
Raw
merge_tool_basics.sh
# Setup your merge tool
$ git config --global merge.tool opendiff
# Use your merge tool when you have conflicts
$ git mergetool
# Cleanup after your merge (delete .orig files)
$ find . -name "*.orig" -delete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment