What problem does it solve? Merge and rebase conflicts interrupt development workflows and are often resolved hastily, losing the intent behind one side of the change. This Skill provides a disciplined process for understanding both sides of every conflict and resolving them correctly. ## 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, pull requests, and original issues—to understand why each change was made. - Intent-Preserving Resolution: Resolves each hunk by preserving both intents where possible, never inventing new behavior and never aborting the merge. - Verification & Completion: Runs the project's automated checks (typecheck, tests, format), fixes regressions, then stages, commits, and finishes the merge or rebase. - Use Case: You run git rebase main on a long-lived feature branch and hit conflicts across five files. The Skill walks through each conflict, reads the original PRs to understand both changes, resolves the hunks, 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.
