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 the current merge/rebase state, git history, commit messages, PRs, and original issues to understand why each change was made. - Intent-Preserving Resolution: Resolves each hunk by preserving both intents where possible, choosing the side matching the merge's stated goal when they are incompatible, and never aborting the merge. - Verification and Completion: Runs the project's typecheck, tests, and formatter, fixes anything the merge broke, then stages, commits, and continues the rebase to completion. - Use Case: You are mid-rebase of a long-lived feature branch and hit conflicts in five files. The Skill traces each conflicting change back to its PR, resolves the hunks without dropping either feature's behavior, runs the test suite, and finishes the rebase. ## Quick Start Resolve the current in-progress git merge conflict, verify the project checks pass, and complete the merge.
