What problem does it solve? Merge and rebase conflicts interrupt development and are often resolved hastily, losing one side's intent 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: 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 hunk by preserving both intents where possible, choosing the side matching the merge's stated goal when they are incompatible, and never aborting the merge. - Verification and Completion: Runs the project's automated checks (typecheck, tests, format), fixes regressions, 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 conflicting 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 in-progress git merge conflict in this repository, preserving both sides' intent, then run the project's checks and finish the merge.
