resolving-merge-conflicts

First inspect the merge state and conflicting files, then trace each conflict to its source commits and PRs to understand intent. Resolve each hunk preserving both intents where possible, run the project's typecheck and tests, then stage everything and commit to finish the merge.

During a rebase, resolve each conflicting hunk in the affected files, stage the changes, and continue the rebase process. Repeat for every commit until all commits are rebased, and run the project's automated checks to confirm nothing broke.

Both are supported by this workflow. Merge preserves branch history with a merge commit, while rebase replays commits for a linear history. The resolution approach is the same: understand each change's intent and never abort mid-conflict.

Pick the side that matches the merge's stated goal and note the trade-off explicitly. Do not invent new behavior that neither side intended, and verify the decision by running the project's tests and typecheck afterward.

Conflicts resolved without understanding the original intent often combine incompatible assumptions. Always read the commit messages and linked issues behind each change, then run typecheck, tests, and formatting before committing the resolution.