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 breaking the build. This Skill provides a disciplined workflow for understanding each conflict's origin, resolving hunks correctly, and finishing the merge safely. ## 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 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 or aborting. - Verification and Completion: Runs the project's automated checks (typecheck, tests, format), fixes anything the merge broke, then stages, commits, and continues the rebase to completion. - Use Case: During a long-running feature branch rebase onto main with conflicts across several files, use this Skill to trace each conflict back to its originating PR, resolve hunks without losing either side's logic, and verify the result with the project's test suite. ## Quick Start Resolve the current in-progress git merge conflict in my repository and finish the merge after running the project's checks.
