Resolving Merge Conflicts

Use when you need to resolve a conflicted or blocked branch state: in-progress git merge/rebase conflicts, PR branch corrections, or other branch-state blockers that need deliberate resolution.

quantumquirkxyz Updated 0 repo stars
Quirk Skills — clarify, review, ship

File contents

quantumquirkxyz/skills-quirk commit 5877c3d15b

Frequently asked questions

npx get-skill add quantumquirkxyz/resolving-merge-conflicts