What problem does it solve? Merge and rebase conflicts interrupt development and are often resolved hastily, losing the intent behind one side of the change. This Skill provides a disciplined workflow for understanding each conflict's origin, resolving hunks without inventing new behavior, and finishing the merge safely. ## 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 by preserving both intents where possible, or choosing the side matching the merge's stated goal while noting trade-offs. - Verification and Completion: Runs the project's automated checks (typecheck, tests, format), fixes merge breakage, then stages, commits, and continues the rebase to completion. - Use Case: During a long-running feature branch rebase onto main, conflicts appear in five files. The Skill traces each conflict to its source PR, resolves hunks without dropping either feature's logic, runs the test suite, and completes the rebase. ## Quick Start Resolve the current in-progress git merge conflict in this repository, preserving the intent of both branches, then run the project checks and finish the merge.
