What problem does it solve? Merge and rebase conflicts stall development work, and resolving them blindly risks losing one side's intent or silently breaking behavior. This Skill provides a disciplined procedure for understanding why each conflicting change was made before editing, so resolutions preserve both intents whenever they are compatible. ## Core Features & Use Cases - State Inspection: Examines git status, the active merge/rebase operation, conflicting files, and unrelated user-owned changes before touching anything. - Intent Tracing: Reads commit messages, PRs, and original issues to understand why each side of a conflict exists. - Safe Resolution Rules: Preserves both intents when compatible, refuses to invent behavior, and stops to ask when a resolution requires a product decision, destructive history change, or out-of-scope permission. - Verified Completion: Runs the repository's checked-in verification commands, confirms no conflict markers remain, stages only resolved paths, and continues the merge or rebase. - Use Case: During a rebase of a feature branch onto main, two commits touch the same function. The Skill traces each change back to its PR, determines the intents are compatible, merges both edits, runs the project's checks, and continues the rebase without staging unrelated working-tree changes. ## Quick Start Resolve the current git merge conflict in my repository, preserving the intent of both sides and verifying with the project's checked-in checks before continuing the merge.
