What problem does it solve? Merge and rebase conflicts interrupt development and are often resolved hastily, losing the intent of one side's changes or introducing broken code. This Skill provides a disciplined workflow for understanding each conflict's origin, resolving hunks correctly, and verifying the result with the project's automated checks. ## Core Features & Use Cases - Conflict Investigation: Inspects git history, commit messages, PRs, and original issues to understand why each conflicting change was made. - Intent-Preserving Resolution: Resolves each hunk to preserve both intents where possible, choosing the side matching the merge's stated goal when they are incompatible, without inventing new behavior. - Verification and Completion: Runs the project's typecheck, tests, and formatting checks, then stages, commits, and continues the rebase until finished. - Use Case: During a long-running feature branch rebase onto main, conflicts appear in shared modules. Use this Skill to trace each change back to its PR, resolve the hunks correctly, run the test suite, and complete the rebase. ## Quick Start Resolve the current in-progress git merge conflict, verify the project checks pass, and finish the merge.
