Resolve Git Conflicts

Objective

Produce a semantically correct resolved tree, preserve intended behavior from all relevant sides, and complete or safely leave the operation in an explicit state.

Use When

• Files contain conflict markers or the index reports unmerged entries.
• A merge, rebase, cherry-pick, revert, or stash apply stopped for conflicts.
• Rename/delete, directory/file, binary, submodule, or modify/delete conflicts need interpretation.
• The user needs help choosing continue, skip, or abort based on the operation.

Do Not Use / Route Elsewhere

• Use integrate-branches to choose and begin merge/rebase.
• Use transplant-commits to choose and begin cherry-pick.
• Use undo-changes when the desired outcome is only aborting a known operation.
• Do not resolve by blanket ours/theirs without contract evidence.