resolving-merge-conflicts

What problem does it solve? Merge and rebase conflicts interrupt development and are often resolved hastily, losing one side's intent or introducing broken code. This Skill provides a disciplined workflow for understanding each conflict's origin and resolving it correctly. ## Core Features & Use Cases - Conflict Investigation: Inspects the current merge/rebase state, git history, and conflicting files to understand what is happening. - Intent-Preserving Resolution: Traces each change back to commits, PRs, and original issues so both intents are preserved where possible, with trade-offs documented when they are incompatible. - Verification and Completion: Runs the project's automated checks (typecheck, tests, format) after resolving, 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. The Skill walks through each hunk, checks the original PRs for intent, resolves them, runs the test suite, and finishes the rebase. ## Quick Start Resolve the current in-progress git merge conflict in my repository, preserving the intent of both branches, then run the project checks and finish the merge.