← ClaudeAtlas

integratelisted

Integrate finished branches into main one at a time — per-branch 4-lens review → merge → conflicts resolved by the implementer → verifier PASS → next (merge queue)
jaewhi-park/GARAGISTE · ★ 1 · Code & Development · score 75
Install: claude install-skill jaewhi-park/GARAGISTE
Integrate branches: $ARGUMENTS (if empty, the completed entries of the "Awaiting integration" list in docs/STATUS.md, in order) 0. Confirm the current branch is main (or the agreed integration branch). If you are on a plan/* branch, stop and ask the CEO. For each branch, strictly one at a time: 1. Review `git diff <current>...<branch>` with team-reviewer across 4 lenses. If there are blockers/majors, have team-implementer fix and commit inside that branch's worktree (`cd <worktree path> && ...`). 2. `git merge --no-ff <branch>`. On conflict, hand team-implementer the conflicting files and both sides' intent (each plan file) to resolve and commit; then review the resolution diff once more with the correctness lens. 3. Quick verification with team-verifier. On FAIL, implementer fix loop (max 3); past that, `git revert -m 1 HEAD` to undo the merge and report to the CEO. 4. On PASS, clean up with `git worktree remove <path>` and `git branch -d <branch>`, have team-planner update STATUS.md, and take the next branch. When all are done, run full verification with team-verifier and do not call it via the Skill tool — suggest to the CEO in a sentence: "run `/ship`".