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, resolving every hunk correctly, and finishing the merge safely. ## Core Features & Use Cases - Context Investigation: Inspects git history, commit messages, PRs, and original issues to understand why each conflicting change was made. - Intent-Preserving Resolution: Resolves each hunk by preserving both intents where possible, and documents trade-offs when they are incompatible. - Verification and Completion: Runs the project's automated checks (typecheck, tests, format), fixes merge breakage, 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 five files. Use this Skill to trace each conflict back to its originating PR, resolve the hunks without dropping either feature, 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 branches, then run the project checks and finish the merge.
