What problem does it solve? Merge and rebase conflicts interrupt development and are often resolved hastily, losing the intent behind one side of the change. This Skill provides a disciplined workflow for understanding each conflict's origin, resolving hunks correctly, and finishing the merge safely. ## Core Features & Use Cases - Conflict Investigation: Inspects the current merge/rebase state, git history, commit messages, PRs, and original issues to understand why each change was made. - Intent-Preserving Resolution: Resolves each conflicting hunk by preserving both intents where possible, documenting trade-offs when they are incompatible, and never inventing new behavior or aborting the merge. - Verification and Completion: Runs the project's automated checks (typecheck, tests, format), fixes anything the merge broke, then stages, commits, and continues the rebase to completion. - Use Case: You are mid-rebase of a long-lived feature branch onto main and hit conflicts in three files. Use this Skill to trace each conflict back to its originating PR, resolve the hunks correctly, run the test suite, and finish the rebase. ## Quick Start Resolve the current in-progress git merge conflict in this repository, preserving the intent of both sides, then run the project's checks and finish the merge.
