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 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 conflicting 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: Discovers and runs the project's automated checks (typecheck, tests, formatting), 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, multiple files conflict. The Skill traces each conflict back to its originating commits and tickets, resolves them coherently, runs the test suite, and finishes the rebase. ## Quick Start Resolve the current git merge conflict in this repository, verify the project checks pass, and complete the merge.
