Conflict Resolution

Lockfiles, migrations, config, version bumps — accept the target version (latest agreed state), then regenerate lockfiles.
Refactored-away code — target's removal wins; rewire to the new location/API.
Additive conflicts (both sides add independent code) — keep both, then run the project's formatter/parser. Conflict boundaries leave orphan closing tags, duplicate brackets, and stray blocks that grep misses but a parser catches.

Partial survival: when a resolution keeps usage of a symbol, verify the declaration and import also survived. Grep the resolved file for every feature-side symbol before continuing.

!cat ~/.claude/skills/migration-reconciliation.md

Merge Commit Message

Pre-commit hooks often reject the default Merge branch 'X' into Y. Use conventional commit format and pass it explicitly: