Last Updated: February 25, 2016
·
743
· suweller

Open all merge conflicts in your editor

Given you export your favorite editor using .bashrc or .zshrc

EDITOR=vim

You can create an alias to quickly open all git conflicted files in a merge/rebase conflict:

alias fix='$EDITOR `git diff --name-only | uniq`'