What problem does it solve? Resolving git merge and rebase conflicts is error-prone: developers often pick one side blindly, lose the intent behind conflicting changes, or abort the merge entirely. This Skill provides a disciplined workflow for understanding each conflict, resolving every hunk correctly, and finishing the merge safely. ## Core Features & Use Cases - Conflict Investigation: Inspects the current merge/rebase state, git history, commit messages, PRs, and original tickets 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 inventing new behavior or aborting. - Verification and Completion: Runs the project's automated checks (typecheck, tests, formatting), fixes anything the merge broke, then stages, commits, and continues the rebase until complete. - Use Case: You are mid-rebase of a long-lived feature branch onto main and hit conflicts in five files. Use this Skill to trace each conflict back to its originating PR, resolve the hunks without losing either change, 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 changes and running the project's checks before committing.
