What problem does it solve? Merge and rebase conflicts interrupt git workflows and are often resolved hastily, losing the intent of one side's changes or breaking the build. This Skill provides a disciplined process for understanding each conflict's origin and resolving it correctly. ## Core Features & Use Cases - Intent Analysis: Traces each conflicting change back to its commit messages, PRs, and original issues to understand why both sides changed the code. - Hunk-by-Hunk Resolution: Resolves each conflict hunk by preserving both intents where possible, or choosing the side matching the merge's stated goal while documenting trade-offs. - Verification and Completion: Runs the project's automated checks (typecheck, tests, format) after resolving, then stages, commits, and continues the rebase to completion. - Use Case: You are mid-rebase of a long-lived feature branch onto main and hit conflicts in five files. Use this Skill to investigate each conflict's origin, resolve them without losing either side's logic, run the test suite, and finish the rebase. ## Quick Start Resolve the current in-progress git merge conflict in my repository, preserving the intent of both branches, then run the tests and finish the merge.
