What problem does it solve? Merge and rebase conflicts interrupt development flow and are often resolved hastily, losing the intent behind one side of the changes. 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 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, and documents trade-offs when they are incompatible. - Verification and Completion: Runs the project's automated checks (typecheck, tests, format) and finishes the merge or continues the rebase to completion. - Use Case: You are mid-rebase of a long-lived feature branch and hit conflicts across several files. Use this Skill to trace each conflict back to its source commits, resolve them without losing either side's behavior, run the test suite, and complete 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.
