resolving-merge-conflicts

See the current state of the merge/rebase. Check git history, and the conflicting files — capture the conflict set now: git diff --name-only --diff-filter=U.

Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Use commit messages and relevant requirements first; expand to PRs/issues only when a disputed hunk needs that history.

Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Resolve rather than reflexively aborting; if the two intents cannot be reconciled, or the merge/rebase itself turns out to be the wrong operation, stop and ask the user before --abort.

Discover the project's automated checks and run them — typically typecheck, then tests, then format. Fix anything the merge broke.

Finish the merge/rebase. Stage only the resolved conflict files, explicitly by path — the list captured in step 1, never git add . / -A. Commit (or rebase --continue) only if the user or the active workstream granted commit authority; otherwise stop with the resolution staged and report what would be committed.