What problem does it solve? Merge and rebase conflicts interrupt git workflows and are often resolved hastily, losing the intent of one side or introducing broken code. This Skill provides a disciplined process for understanding each conflict and resolving it correctly. ## Core Features & Use Cases - Conflict Analysis: Inspect the current merge/rebase state, git history, and conflicting files before touching anything. - Intent-Preserving Resolution: Trace each change back to commit messages, PRs, and original issues so both intents are preserved where possible, with trade-offs noted when they are incompatible. - Verification and Completion: Run the project's automated checks (typecheck, tests, format), fix merge breakage, then stage, commit, and continue the rebase to completion. - Use Case: During a long-running feature branch rebase onto main, conflicts appear in five files. Use this Skill to understand why each side changed the code, resolve every hunk without inventing new behavior, and finish the rebase with all checks passing. ## Quick Start Resolve the current git merge conflict in this repository, preserving the intent of both branches and running the project checks before committing.
