Skip to content

Instantly share code, notes, and snippets.

@hyponymous

hyponymous/edit-conflicted.sh

Created June 3, 2016 18:36
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 hyponymous/b05c7f33adfc966dd7b6399f7d2c57ec to your computer and use it in GitHub Desktop.
Save hyponymous/b05c7f33adfc966dd7b6399f7d2c57ec to your computer and use it in GitHub Desktop.
Download ZIP
One-liner that opens all files with git conflicts in vim, highlighting the conflict boundaries
Raw
edit-conflicted.sh
vim +/"^[<>|=]\{7}" $(git status -sb | grep "^UU" | cut -d' ' -f 2) # ;edit-conflicted
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment