JeromeParadis/merge_mine_theirs.sh

Created June 22, 2012 14:27

Star () You must be signed in to star a gist
Fork () You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/JeromeParadis/2973056.js"></script>
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