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 - Context Investigation: Inspect the current merge/rebase state, git history, commit messages, PRs, and original tickets to understand why each change was made. - Intent-Preserving Resolution: Resolve each conflicting hunk by preserving both intents where possible, choosing the side matching the merge's stated goal when they are incompatible, and never inventing new behavior or aborting. - Verification and Completion: Run the project's automated checks (typecheck, tests, formatting), fix anything the merge broke, then stage, commit, and continue the rebase until finished. - Use Case: During a long-running feature branch rebase onto main, conflicts appear across several files. Use this Skill to trace each conflict back to its originating PR, resolve hunks without losing either change, and verify the result with the project's test suite. ## 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.
