mirror of
https://github.com/garrytan/gstack.git
synced 2026-05-22 04:38:24 +08:00
fix: resolve merge conflicts with origin/main (v0.5.1 + v0.5.2)
Merge main's gstack-slug helper, review dashboard, screenshot visibility, and design-consultation enhancements into the office-hours branch. Conflicts resolved: - CHANGELOG: keep both 0.6.0 (ours) and 0.5.1/0.5.2 (main) entries - VERSION: keep 0.6.0 (ours) - design-consultation: use gstack-slug + office-hours naming - plan-eng-review: use gstack-slug - office-hours: adopt gstack-slug for SLUG/BRANCH computation Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -50,6 +50,15 @@ You are running the `/ship` workflow. This is a **non-interactive, fully automat
|
||||
|
||||
3. Run `git diff <base>...HEAD --stat` and `git log <base>..HEAD --oneline` to understand what's being shipped.
|
||||
|
||||
4. Check review readiness:
|
||||
|
||||
{{REVIEW_DASHBOARD}}
|
||||
|
||||
If the verdict is NOT "CLEARED TO SHIP (3/3)", use AskUserQuestion:
|
||||
- Show which reviews are missing or have open issues
|
||||
- RECOMMENDATION: Choose B (run missing reviews first) unless the change is trivial
|
||||
- Options: A) Ship anyway B) Abort — run missing review(s) first C) Reviews not relevant for this change
|
||||
|
||||
---
|
||||
|
||||
## Step 2: Merge the base branch (BEFORE tests)
|
||||
|
||||
Reference in New Issue
Block a user