#!/usr/bin/env sh
set -eu
printf 'Conflicted files:
'
git diff --name-only --diff-filter=U
printf '
Conflict markers:
'
git grep -n -E '^(<<<<<<<|=======|>>>>>>>)' -- . || true
# Resolve each file deliberately, then:
# git add <resolved-file>
# git status
# git commit   # merge flow
# git rebase --continue   # rebase flow
# Recovery: git merge --abort OR git rebase --abort