melastmohican/resolve_conflicts_theirs.sh

Last active March 1, 2018 19:05

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/melastmohican/c4ac547487b247f66023ea37a2fc4a20.js"></script>
Save melastmohican/c4ac547487b247f66023ea37a2fc4a20 to your computer and use it in GitHub Desktop.

Download ZIP

Raw

resolve_conflicts_theirs.sh

	grep -lr '<<<<<<<' .
	grep -lr '<<<<<<<' . \| xargs git checkout --theirs

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment