resolving-merge-conflicts

Files (1)

• SKILL.md

SKILL.md (first lines)

# Resolving merge conflicts

## Process

1. **See the current state** — check git history and list conflicting
   files.

2. **Find primary sources** for each conflict — understand why each
   side made its change. Review commit messages, PRs, and original
   tickets.

3. **Resolve each hunk** preserving both intents where possible. When
   incompatible, select the resolution matching the merge's stated goal
   and document the trade-off in the commit message. Never invent new
   behavior that neither side intended.

4. **Run automated checks** — typecheck, tests, format. Fix any
   breakage introduced by the resolution.

5. **Finish the merge/rebase** — stage everything and commit. If
   rebasing, continue until all commits are applied.

## What this skill must never do

- Never resolve by silently dropping one side's changes.
- Never invent new behavior — only combine or choose existing intents.
- Never skip automated checks after resolution.
- Never abort without attempting resolution first.

From lynchypin/project-onboard, MIT.

More from lynchypin/project-onboard