mirror of
https://github.com/garrytan/gstack.git
synced 2026-05-07 05:56:41 +02:00
merge: resolve conflicts with main (v0.11.5.0 → v0.11.5.1)
VERSION and CHANGELOG conflicts resolved: our inline office-hours feature rebased on top of main's v0.11.5.0 (Bash Compatibility Fix).
This commit is contained in:
+1
-1
@@ -448,7 +448,7 @@ State what you examined and why nothing was flagged (1-2 sentences minimum).
|
||||
Before doing anything, save the plan file's current state to an external file:
|
||||
|
||||
```bash
|
||||
source <(~/.claude/skills/gstack/bin/gstack-slug 2>/dev/null) && mkdir -p ~/.gstack/projects/$SLUG
|
||||
eval "$(~/.claude/skills/gstack/bin/gstack-slug 2>/dev/null)" && mkdir -p ~/.gstack/projects/$SLUG
|
||||
BRANCH=$(git rev-parse --abbrev-ref HEAD 2>/dev/null | tr '/' '-')
|
||||
DATETIME=$(date +%Y%m%d-%H%M%S)
|
||||
echo "RESTORE_PATH=$HOME/.gstack/projects/$SLUG/${BRANCH}-autoplan-restore-${DATETIME}.md"
|
||||
|
||||
@@ -107,7 +107,7 @@ State what you examined and why nothing was flagged (1-2 sentences minimum).
|
||||
Before doing anything, save the plan file's current state to an external file:
|
||||
|
||||
```bash
|
||||
source <(~/.claude/skills/gstack/bin/gstack-slug 2>/dev/null) && mkdir -p ~/.gstack/projects/$SLUG
|
||||
{{SLUG_SETUP}}
|
||||
BRANCH=$(git rev-parse --abbrev-ref HEAD 2>/dev/null | tr '/' '-')
|
||||
DATETIME=$(date +%Y%m%d-%H%M%S)
|
||||
echo "RESTORE_PATH=$HOME/.gstack/projects/$SLUG/${BRANCH}-autoplan-restore-${DATETIME}.md"
|
||||
|
||||
Reference in New Issue
Block a user