jettypod 4.4.10 → 4.4.11

package/skills-templates/stable-mode/SKILL.md

@@ -506,6 +506,9 @@ More stable mode chores remain. Starting next chore:
 # Commit changes in the worktree
 git add . && git commit -m "feat: [brief description of error handling added]"
 
+# Switch to main repo before merging (merge cannot run from inside worktree)
+cd $(git rev-parse --git-common-dir)/..
+
 # Merge current chore - this automatically marks it as done
 jettypod work merge
 
@@ -517,7 +520,7 @@ jettypod work start [next-chore-id]
 - ❌ DO NOT use `jettypod work status <id> done`
 - ❌ DO NOT use `jettypod work complete <id>`
 - ❌ DO NOT use `jettypod work set-mode <id> done`
-- ✅ ONLY use `jettypod work merge`
+- ✅ ONLY use `jettypod work merge` (from main repo, not worktree)
 
 The merge command handles everything: pushes branch, merges to main, marks chore done, cleans up worktree.
 
@@ -614,8 +617,9 @@ git commit -m "feat: [brief description of what was implemented]"
 git push
 ```
 
-Then use the merge command to merge to main (which auto-marks chore as done via post-merge hook):
+Then switch to main repo and use the merge command (which auto-marks chore as done):
 ```bash
+cd $(git rev-parse --git-common-dir)/..  # Switch to main repo
 jettypod work merge
 ```
 
@@ -662,6 +666,7 @@ After completing EACH stable chore:
 ```bash
 # Complete chore #1854
 git add . && git commit -m "feat: [description]"
+cd $(git rev-parse --git-common-dir)/..  # Switch to main repo
 jettypod work merge  # Automatically pushes, merges, and cleans up
 
 # NOW start chore #1855 (main has #1854's changes)
@@ -669,6 +674,7 @@ jettypod work start 1855
 
 # Complete chore #1855
 git add . && git commit -m "feat: [description]"
+cd $(git rev-parse --git-common-dir)/..  # Switch to main repo
 jettypod work merge  # Automatically pushes, merges, and cleans up
 
 # NOW start chore #1856 (main has #1854 + #1855's changes)