Quick resolve multiple files with conflicts when you know if you want "ours" or "theirs" for the resolution

command.sh

# Helpful for when running git rebase -i and selecting multiple files to fixup or drop


# select ours for each conflict
git status | grep both | awk '{print $3}' | xargs git checkout --ours
# select theirs for each conflict
git status | grep both | awk '{print $3}' | xargs git checkout --theirs

# run with && git add . && git rebase --continue to add and move on
git status | grep both | awk '{print $3}' | xargs git checkout --ours && git add . && git rebase --continue