resolving-merge-conflicts

Resolve each conflicting hunk by first understanding why both sides changed the code, using git history, commit messages, and PRs. Preserve both intents where possible, and when they are incompatible, keep the change matching the merge's stated goal while noting the trade-off.

After resolving all conflicting files, stage everything and continue the rebase until all commits are replayed. Run the project's automated checks such as typecheck and tests first to catch anything the merge broke.

Both produce conflicts when branches diverge on the same lines, and the resolution process is the same: inspect each hunk, understand intent, and resolve. This Skill handles either case and always completes the operation rather than aborting.

Textual conflict resolution does not guarantee semantic correctness; two changes can merge cleanly yet break types or tests together. Always run the project's automated checks after resolving and fix any breakage before committing.

This Skill never aborts; it always resolves conflicts by tracing original intent. Aborting is only appropriate when the merge itself was started by mistake, not because conflicts seem difficult.