Git Resolve Conflicts

Finish an in-progress merge, rebase, cherry-pick, revert, or stash pop. The operation completes; it is never aborted to make the conflict go away.

Conflicts are resolved wrongly for one reason: someone edits the markers without knowing why either side wrote that code. This workflow recovers both intents first, resolves by class rather than by reflex, and records which intent survived each hunk so the resolution can be reviewed.

1. See where the operation stopped

git status --short --branch
git rev-parse --git-dir
ls "$(git rev-parse --git-dir)" | grep -E 'MERGE_HEAD|REBASE|CHERRY_PICK_HEAD|REVERT_HEAD'
git diff --name-only --diff-filter=U -z | tr '\0' '\n'
git log --oneline --left-right --boundary HEAD...MERGE_HEAD 2>/dev/null | head -40