Resolving Merge Conflicts

Use when you need to resolve an in-progress git merge/rebase conflict.

toverux Updated 3 repo stars
The loop panel: the stage rail with review-gate lit, the feature's ticket board, a --loop gate run with two findings parked for you, the finders at work and the

File contents

toverux/cantrips commit 56d78623dd

Frequently asked questions

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