resolving-merge-conflicts

Read the current state of the merge or rebase. Inspect the git history and the files that conflict.

Trace each conflict back to its source. Understand fully why each side made its change and what it was trying to achieve — read the commit messages, look at the PRs, follow the originating issues/tickets.

Resolve every hunk. Keep both intents wherever they can coexist. Where they can't, take the side that matches the merge's stated goal and record the trade-off. Do not invent new behaviour. Always resolve; never --abort.

Find the project's automated checks and run them — usually typecheck first, then tests, then format. Repair whatever the merge broke.

Complete the merge/rebase. Stage everything and commit. If you're rebasing, keep continuing until every commit is replayed.