resolving-merge-conflicts

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 every hunk correctly, and finishing the merge safely. ## Core Features & Use Cases - Conflict 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) and completes the merge or continues the rebase to the end. - Use Case: You run git rebase main on a long-lived feature branch and hit conflicts across five files. The Skill traces each conflict back to its originating commits, resolves them without inventing new behavior, runs the test suite, and finishes the rebase. ## Quick Start Resolve the current git merge conflict in my repository, then run the project checks and finish the merge.