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 every hunk correctly, and verifying the result with the project's automated checks. ## 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 hunk by preserving both intents where possible, choosing the side matching the merge's stated goal when incompatible, and never aborting or inventing new behavior. - Verification and Completion: Runs the project's typecheck, tests, and formatting checks, fixes anything the merge broke, then stages, commits, and continues the rebase to completion. - Use Case: During a long-running feature branch rebase onto main, conflicts appear across five files. The Skill traces each conflicting change to its original PR, resolves hunks to keep both the new feature logic and upstream refactors, runs the test suite, and finishes the rebase cleanly. ## Quick Start Resolve the current git merge conflict in my repository, preserving the intent of both branches, then run the project checks and finish the merge.
