Skip to content

Instantly share code, notes, and snippets.

@JeromeParadis

JeromeParadis/merge_mine_theirs.sh

Created June 22, 2012 14:27
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 JeromeParadis/2973056 to your computer and use it in GitHub Desktop.
Save JeromeParadis/2973056 to your computer and use it in GitHub Desktop.
Download ZIP
git merge: keep ours our theirs
Raw
merge_mine_theirs.sh
git checkout --theirs filename_path
git checkout --ours filename_path
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment