What problem does it solve? Merge conflicts during git merges, rebases, and cherry-picks often get resolved by blindly picking one side, silently discarding the other branch's work. This Skill enforces a disciplined resolution loop that understands why each side changed the code before reconciling them. ## Core Features & Use Cases - Intent-Preserving Resolution: Reads each side's diff against the merge base and traces commit messages, PRs, or issues to explain both changes before editing any hunk. - Operation-Aware Semantics: Distinguishes merge, rebase, and cherry-pick states (MERGE_HEAD, REBASE_HEAD, CHERRY_PICK_HEAD) so "ours" and "theirs" are interpreted correctly. - Verification Before Completion: Discovers the project's test, lint, and build commands from package.json, Makefile, README, or CI config and runs them before staging and continuing the operation. - Use Case: During a rebase, a teammate's retry-backoff refactor conflicts with your cache-invalidation fix on the same lines. The Skill walks you through both diffs, produces a merged hunk honoring both intents, runs the test suite, and continues the rebase with a commit message naming both reconciled changes. ## Quick Start Resolve the merge conflicts in my current git rebase, preserving the intent of both sides and running the project checks before continuing.
