You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
fix(ship-skill): push step needs force-with-lease too, not just babysit's
Step 2's sync recovery rewrites already-pushed commits on a branch
that's been pushed before, but the push step only said 'push using
the current branch name' with no force-with-lease — a plain push
would be rejected in exactly the polluted-remote case step 2 exists
to fix. babysit already got this fix; ship's own push step didn't.
Copy file name to clipboardExpand all lines: .agents/skills/ship/SKILL.md
+4-1Lines changed: 4 additions & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -38,7 +38,10 @@ When the user runs `/ship`:
38
38
-`bun run lint` to fix formatting issues
39
39
-`bun run check:api-validation:strict` to catch boundary contract failures before CI
40
40
7.**Stage and commit** the changes with the generated message
41
-
8.**Push to origin** using the current branch name
41
+
8.**Push to origin** using the current branch name — `--force-with-lease` if step 2's sync
42
+
check did any history rewrite (a clean rebase or a cherry-pick rebuild) on a branch that had
43
+
already been pushed once; a plain push would be rejected in exactly the polluted-remote case
44
+
step 2 exists to fix
42
45
9.**Create a PR** to staging with a description in the user's voice, then do a final content check — not a count check — comparing what actually landed:
Copy file name to clipboardExpand all lines: .cursor/commands/ship.md
+4-1Lines changed: 4 additions & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -31,7 +31,10 @@ When the user runs `/ship`:
31
31
32
32
5.**Stage and commit** the changes with the generated message
33
33
34
-
6.**Push to origin** using the current branch name
34
+
6.**Push to origin** using the current branch name — `--force-with-lease` if step 2's sync
35
+
check did any history rewrite (a clean rebase or a cherry-pick rebuild) on a branch that had
36
+
already been pushed once; a plain push would be rejected in exactly the polluted-remote case
37
+
step 2 exists to fix
35
38
36
39
7.**Create a PR** to staging with a description in the user's voice, then do a final content check — not a count check — comparing what actually landed:
0 commit comments