What problem does it solve? Merge and rebase conflicts interrupt development and are often resolved hastily, losing the intent of one side or introducing broken code. This Skill provides a disciplined workflow for understanding each conflict's origin, resolving every hunk correctly, and verifying the result with the project's automated checks. ## 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 typecheck, tests, and formatting, then stages, commits, and continues the rebase until finished. - Use Case: You run git rebase main on a long-lived feature branch and hit conflicts across several files. The Skill traces each change back to its PR, resolves the hunks without inventing new behavior, runs the test suite, and completes the rebase. ## Quick Start Resolve the current git merge conflict in this repository, run the project checks, and finish the merge.
