What problem does it solve? Merge and rebase conflicts interrupt development and are often resolved hastily, losing the intent of one side's changes or breaking the build. This Skill provides a disciplined workflow for understanding each conflict's origin and resolving it correctly. ## Core Features & Use Cases - Conflict Investigation: Inspect the current merge/rebase state, git history, and conflicting files before touching anything. - Intent-Preserving Resolution: Trace each change back to its commit messages, PRs, and original issues so both intents are preserved where possible, with trade-offs documented when they are incompatible. - Verification and Completion: Run the project's automated checks (typecheck, tests, format) after resolving, then stage, commit, and continue the rebase to completion. - Use Case: You run git rebase main on a long-lived feature branch and hit conflicts across five files. Use this Skill to understand why each side changed the code, resolve every hunk without inventing new behavior, verify the test suite passes, and finish the rebase cleanly. ## 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.
