What problem does it solve? Merge and rebase conflicts interrupt development work 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: Inspect the current merge/rebase state, git history, commit messages, PRs, and original issues to understand why each change was made. - Intent-Preserving Resolution: Resolve each conflicting hunk by preserving both intents where possible, choosing the side matching the merge's stated goal when they are incompatible, and never inventing new behavior. - Verification and Completion: Run the project's typecheck, tests, and formatting checks, fix anything the merge broke, then stage, commit, and continue the rebase to completion. - Use Case: You are rebasing a long-lived feature branch onto main and hit conflicts in three files. Use this Skill to trace each conflict back to its originating PR, resolve the hunks without losing either change, run the test suite, and finish the rebase cleanly. ## Quick Start Resolve the current git merge conflict in my repository, verify the project checks pass, and finish the merge.
