What problem does it solve? Merge and rebase conflicts interrupt development and are risky to resolve by hand, since blindly picking one side can silently discard a teammate's intended change. This Skill guides a structured resolution process that preserves the intent of both sides and finishes the merge safely. ## Core Features & Use Cases - State Inspection: Examines the current merge/rebase state, git history, and 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: Resolves each conflict hunk while preserving both intents where possible, never aborting and never inventing new behavior. - Verification & Completion: Runs the project's automated checks (typecheck, tests, format), fixes merge breakage, then stages, commits, and continues the rebase to completion. - Use Case: You run git rebase main on a long-lived feature branch and hit conflicts across five files. The Skill inspects each conflict, reads the relevant commits and PRs, resolves every hunk in line with the rebase goal, runs the test suite, and completes the rebase. ## Quick Start Resolve the current git merge conflict in my repository, preserving the intent of both branches, then run the tests and finish the merge.
