What problem does it solve? Merge and rebase conflicts interrupt development and are often resolved hastily, losing one side's intent or breaking the build. This Skill provides a disciplined workflow for understanding each conflict's origin, resolving hunks correctly, and verifying the result with the project's automated checks. ## Core Features & Use Cases - State Inspection: Examines the current merge/rebase state, git history, and conflicting files before touching anything. - Intent-Preserving Resolution: Traces each conflict back to commits, PRs, and original issues so both intents are preserved where possible, with trade-offs noted when they are incompatible. - Verification and Completion: Runs the project's typecheck, tests, and formatting checks, then stages, commits, and continues the rebase until finished. - Use Case: You are mid-rebase of a long-lived feature branch onto main and hit conflicts in five files. Use this Skill to understand why each side changed, resolve every hunk without inventing new behavior, run the test suite, and complete the rebase cleanly. ## Quick Start Resolve the current git merge conflict in my repository, preserving both sides' intent, then run the project checks and finish the merge.
