Files
Trevin Chow d8826490a5 fix(commit-push-pr): preserve intentional unpushed commits when branching from default
Round 2 of feedback on Step 4.1: the previous version always branched
from `origin/<base>`, which silently dropped unpushed commits the user
intended for the new feature branch (the "forgot to branch first"
workflow). Local git state cannot distinguish that intent from
stale-base contamination — the unpushed commits look identical and
shared `user.email` makes authorship unreliable across multi-agent
sessions.

Step 4.1 now asks the user when `origin/<base>..HEAD` is non-empty:
carry the commits onto the new branch (HEAD) or leave them on local
`<base>` (origin/`<base>`). The user is the only reliable source of
intent here.

Step 4.1's prose has accumulated three conditional branches across two
review rounds (fetch, unpushed-commits, checkout overwrite). Extracted
the full decision flow to `references/branch-creation.md` per the
extraction guidance for conditional content; Step 4.1 in SKILL.md is
now a 1-line stub. The round-1 stash-retry-pop fallback is preserved
in the reference file.

Stable/Beta sync: not propagating — no `-beta` counterpart exists for
`ce-commit-push-pr`.

Addresses Codex review feedback on #708.

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-27 16:34:34 -07:00
..
2026-04-22 14:21:19 -07:00