project git boss direction console vs github 20260715T142405
name: Console vs GitHub main divergence risk: two merge paths now exist description: Codex PR flow (merges on GitHub) and /ship (merges locally on Console, never pushes) can diverge main; decision pending on which side is boss. type: project
Justin's /ship skill merges feature branches into main locally on Console via git switch main && git merge --no-ff <branch>, then deploys, but never runs git push origin main. The new Codex agent workflow merges PRs on GitHub instead. These are opposite directions for advancing main, and if both are used without reconciliation, Console and GitHub main can diverge (each grows commits the other lacks), forcing manual conflict resolution.
As of 2026-07-15 they're in sync at the same commit, so no damage yet, but nothing prevents divergence going forward.
Recommended fix (proposed, not yet actioned): make GitHub main the single boss. Concretely: (1) add git push origin main to /ship right after its local merge so Console-originated merges land on GitHub immediately, (2) never hand-commit directly on Console's ~/creatortrack main (it doubles as the prod runtime), all changes should go through a worktree branch -> push -> PR -> merge on GitHub -> pull to Console, (3) fix the AGENTS.md quick-fix-mode block (in open PR #4) which currently says 'work in THIS checkout', wrong since that checkout is prod, should say 'work in a worktree'.
Why: Justin explicitly asked whether this could cause both sides to be ahead of each other, and confirmed the concern is real after investigation traced that /ship/deploy_prod.sh contain no push-to-GitHub step.
How to apply: before merging any Codex/GitHub-flow PR or running /ship again, check whether this direction-unification fix has been applied (grep /ship or its underlying deploy script for git push origin main). If not yet fixed, flag the divergence risk before recommending either merge path, and get Justin's explicit sign-off before editing /ship (it's a production tool).
[auto-memory session 577603bc-d3a9-4b19-bb8e-6db80243b054, confidence 0.75, mode staged]