resolving-merge-conflicts

What problem does it solve? Merge and rebase conflicts interrupt development and are often resolved hastily, losing the intent of one side's changes or introducing broken code. This Skill provides a disciplined workflow for understanding each conflict's origin, resolving hunks correctly, and verifying the result with the project's automated checks. ## Core Features & Use Cases - State Inspection: Examines the current merge/rebase state, git history, and conflicting files before touching anything. - Intent-Driven Resolution: Traces each conflict back to commit messages, PRs, and original issues so resolutions preserve both intents where possible, and never invents new behavior. - Verification and Completion: Runs the project's typecheck, tests, and formatting after resolution, then stages, commits, and continues the rebase to completion. - Use Case: You are mid-rebase of a feature branch onto main and hit conflicts in three files. The Skill walks through each hunk using the original PR context, resolves them, 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 and running the project tests afterward.