mirror of https://github.com/garrytan/gstack.git
9589d878e4
`/ship` now invokes `/pr-prep --base $BASE_BRANCH --json` with `GSTACK_FROM_SHIP=1` before any of: merge base branch, run tests, version bump, push. If pr-prep returns EXACT_DUP (exit 1), ship aborts with a pinpoint message naming the upstream PR + resolution paths (close mine / cherry-pick unique parts / coordinate + retry with `--skip-pr-prep`). Skip conditions: no upstream remote (solo-repo case), `--skip-pr-prep` flag, or pr-prep skill not installed (older gstack — stderr warn + continue). SIBLING / OVERLAP / CLEAN buckets do not block. The JSON report is written to `/tmp/ship-pr-prep.json` so PR body assembly can render upstream context as a collapsed section. Fails fast before any test run wastes time on a branch that duplicates already-open upstream work. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| sections | ||
| SKILL.md | ||
| SKILL.md.tmpl | ||