What problem does it solve? Merge and rebase conflicts interrupt git workflows and are often resolved hastily, losing the intent behind one side of the change. This Skill provides a disciplined procedure for understanding each conflict, resolving every hunk correctly, and completing the merge or rebase safely. ## Core Features & Use Cases - Conflict Investigation: Inspects the current merge/rebase state, git history, commit messages, PRs, and original tickets to understand why each change was made. - Intent-Preserving Resolution: Resolves each conflicting hunk by preserving both intents where possible, and documents trade-offs when they are incompatible—never aborting the merge. - Verification and Completion: Runs the project's automated checks (typecheck, tests, formatting), fixes regressions, then stages, commits, and continues the rebase until finished. - Use Case: You run git rebase main and hit conflicts across three files. The Skill traces each conflicting change back to its originating PR, resolves the hunks without dropping either feature's behavior, runs the test suite, and completes the rebase. ## 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.
