What problem does it solve? Merge and rebase conflicts stall development and are often resolved hastily, losing one side's intent 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 - State Inspection: Examines the current merge/rebase state, git history, and conflicting files before touching anything. - Intent-Driven Resolution: Traces each conflict to its source commits, PRs, and issues so resolutions preserve both intents where possible and never invent new behavior. - Verification and Completion: Runs the project's typecheck, tests, and formatting, then stages, commits, and continues the rebase to completion. - Use Case: You are mid-rebase of a long-lived feature branch onto main and hit conflicts across several files. Use this Skill to understand why each side changed, resolve every hunk deliberately, run the test suite, and finish the rebase cleanly. ## Quick Start Resolve the current git merge conflict in my repository, run the project checks, and finish the merge.
