Skip to content

Instantly share code, notes, and snippets.

@ystrohanov

ystrohanov/open_conflicts.md

Last active May 17, 2019 15:33
Show Gist options
  • Save ystrohanov/78798486a0761742f282ba9450601b43 to your computer and use it in GitHub Desktop.
Save ystrohanov/78798486a0761742f282ba9450601b43 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
open_conflicts.md

Open all files with git merge conflicts in editor

git diff --name-only | uniq | xargs vim [subl, code]

alias fix='$EDITOR `git diff --name-only | uniq`'
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment