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 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 conflicting hunk by preserving both intents where possible, and documents trade-offs when intents are incompatible. - Verification and Completion: Runs the project's typecheck, tests, and formatting checks, then stages, commits, and continues the rebase until finished. - Use Case: You are mid-rebase of a feature branch onto main and hit conflicts in three files. Use this Skill to trace each conflict back to its originating PR, resolve the hunks without losing either side's logic, run the test suite, and complete the rebase. ## Quick Start Resolve the current git merge conflict in my repository, preserving the intent of both branches, then run the project checks and finish the merge.
