Skip to content

Instantly share code, notes, and snippets.

@antoniopresto

antoniopresto/resolve.md

Created March 12, 2018 15:32
Show Gist options
  • Save antoniopresto/45e1db3b6f4cfdfaf2bd2d7b6b257849 to your computer and use it in GitHub Desktop.
Save antoniopresto/45e1db3b6f4cfdfaf2bd2d7b6b257849 to your computer and use it in GitHub Desktop.
Download ZIP
Git - Resolve multiple conflicts
Raw
resolve.md

grep -lr '<<<<<<<' . | xargs git checkout --ours OR grep -lr '<<<<<<<' . | xargs git checkout --theirs

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