What problem does it solve? Merge and rebase conflicts interrupt development and are often resolved hastily, losing the intent behind one side of the change. This Skill provides a disciplined workflow for understanding both sides of every conflict and resolving them without losing work. ## Core Features & Use Cases - State Inspection: Examines the current merge/rebase state, git history, and all conflicting files before touching anything. - Intent Analysis: Traces each conflict back to its primary sources—commit messages, PRs, and original issues—to understand why each change was made. - Hunk-by-Hunk Resolution: Preserves both intents where possible, picks the side matching the merge's stated goal when incompatible, and never aborts or invents new behavior. - Verification & Completion: Runs the project's automated checks (typecheck, tests, format), fixes breakage, then stages, commits, and finishes the merge or rebase. - Use Case: You are mid-rebase of a long-lived feature branch onto main and hit conflicts across five files. The Skill walks through each conflict, checks the original PRs, resolves each hunk, runs the test suite, and completes the rebase. ## Quick Start Resolve the current in-progress git merge conflict in this repository, preserving the intent of both branches, then run the project checks and finish the merge.
