Last Updated: February 25, 2016
·
325
· nlight

Git conflicts resolving helpers

# Filter all conflicts from git status
alias conflicts='git status -s | grep -e "^\(DD\|AU\|UD\|UA\|DU\|AA\|UU\)" | cut -d " " -f2'

# Open all conflicts in your favourite editor
alias resolve='conflicts | xargs subl'

# Stage them after you've done
alias cadd='conflicts | xargs git add'