What problem does it solve? Merge and rebase conflicts interrupt git workflows and are often resolved hastily, losing the intent of one side's changes or introducing broken code. This Skill provides a disciplined process for understanding each conflict's origin and resolving it correctly. ## Core Features & Use Cases - Intent Analysis: Traces each conflicting change back to its commit messages, PRs, and original issues to understand why it was made. - Hunk-by-Hunk Resolution: Preserves both intents where possible, picks the side matching the merge's stated goal when incompatible, and never aborts the merge. - Verification and Completion: Runs the project's automated checks (typecheck, tests, format) and finishes the merge or continues the rebase to completion. - Use Case: During a long-running feature branch rebase onto main, conflicts appear in five files. Use this Skill to investigate each conflict's origin, resolve every hunk without inventing new behavior, run the test suite, and complete the rebase. ## Quick Start Resolve the current in-progress git merge conflict in my repository and finish the merge after running the project checks.
