Merge Conflict Reconciliation

Reconcile an active Git merge, rebase, or cherry-pick conflict by inspecting exact repository state, preserving both sides' intent, validating the result, and keeping abort available. Invoke explicitly for an identified conflicted worktree; staging, continuing, committing, and pushing require separate authority.

JovaniPink Updated 1 repo stars

File contents

JovaniPink/skills commit fdbe93282b

Frequently asked questions

npx get-skill add jovanipink/merge-conflict-reconciliation-2