Skip to content

Instantly share code, notes, and snippets.

@Addono

Addono/Merge choose other RegEx

Created February 26, 2017 11:53
Show Gist options
  • Save Addono/096d4e5b86940c87538f2d4891ece36a to your computer and use it in GitHub Desktop.
Save Addono/096d4e5b86940c87538f2d4891ece36a to your computer and use it in GitHub Desktop.
Download ZIP
Chooses the merge branche for all merge conflict markers.
Raw
Merge choose other RegEx
<<<<<<< HEAD[\s\S]*?=======([\s\S]*?)>>>>>>> upstream/master
$1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment