Merge

Absorb one or more feature branches into the base branch. Recommends merge vs rebase per branch. On conflict, aborts that branch + surfaces the file list + stops. Resolution out of scope; routes to the harness-named conflict-resolution agent or the user.

RockyHong Updated 3 repo stars
super-bootstrap: one command writes CLAUDE.md, curates MCPs + skills, seeds work cards

File contents

RockyHong/super-bootstrap commit 985f7f450b

Frequently asked questions

npx get-skill add rockyhong/merge