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 procedure for understanding each conflict's origin and resolving it correctly. ## Core Features & Use Cases - Intent-Preserving Resolution: Traces each conflicting change back to its commit messages, PRs, and original issues so both intents are preserved where possible. - Guided Hunk-by-Hunk Workflow: Resolves each conflict hunk against the merge's stated goal, never aborting and never inventing new behavior. - Post-Resolution Verification: Discovers and runs the project's automated checks (typecheck, tests, format) before staging, committing, and completing the merge or rebase. - Use Case: During a long-running feature branch rebase onto main, conflicts appear across several files. The Skill inspects the history behind each change, resolves every hunk, runs the test suite, and continues the rebase to completion. ## Quick Start Resolve the current git merge conflict in this repository, preserving the intent of both branches and running the project checks before committing.
