Repository navigation
fix: join main's release history into dev so promotions merge cleanly #1375
Description
Bug
The dev → main promotion #1374 conflicts in pyproject.toml and uv.lock.
The release-please back-merge PRs are squash-merged. For example, #1366 (chore: back-merge v7.0.0 into dev) has one parent. So the release commits on main never become ancestors of dev; the last real merge of main into dev was #656. Each promotion replays the release commit's version edit against dev. #1373 changed the adjacent name line to lilrae, so the two edits now conflict.
Fix
- Merge
origin/maininto a branch fromdevand resolve the conflict:name = "lilrae",version = "7.0.0", and the matchinguv.lockentry. - Merge that PR into
devwith a merge commit, not a squash, somainbecomes an ancestor ofdev. - In
docs/releasing.mdand the back-merge PR body, say that the back-merge uses a merge commit.
Acceptance criteria
origin/mainis an ancestor oforigin/dev.- chore: promote dev to main #1374 shows no merge conflict.
- The release guide and the automated back-merge PR body tell the maintainer to use a merge commit.
Activity
Brad-Edwards commentedon Oct 14, 2026
🛠️ Picked up by /implement - driver claude-code, branch
1375-join-main-history, 2026-10-14T02:42:18.665Z.Brad-Edwards commentedon Oct 14, 2026
gc_codex_review — sanitized deferred publication for issue #1375, cycle 1 of 1
Reviewed revision:
f9ee26bacf5a49c553abed8ced27c11f111e28c2065bb274e70dbec028073148Architectural read
Core: the change states the merge strategy at the existing operator decision point and keeps the back-merge PR body and the release guide aligned. It adds no automation. The new assertions protect the wording, and shell quoting keeps it intact in the PR body. Security: workflow permissions, branch selection, and the environment-bound tag are unchanged. No exploitable issue was found.
Verdict:
shipFindings
Brad-Edwards commentedon Oct 14, 2026
gc_codex_review pre-push cycle 1 of 1 complete for issue #1375 on branch '1375-join-main-history'. Posted by the MCP server to enforce the pre-push hard-cap-1 contract (issues #796, #804, #906). Do not edit or delete — used by the next
gc_codex_review(uncommitted) invocation to count cycles.Brad-Edwards commentedon Oct 14, 2026
Review decision record — codex cycle 1 (issue #1375)
Reviewer: codex
Cycle: 1
Verdict:
shipArchitectural read:
Blocking findings: 0 (clean run)
Brad-Edwards commentedon Oct 14, 2026
Pre-PR base synchronization
refs/remotes/origin/devat0796c7fcaec1ce9388087cb22eb65bcb89b75165already_current056e15370278a7701786f0b5a0b840f234a158bf57462f0b4962fed3bbf4851cb097b6e739cbdb0dBrad-Edwards commentedon Oct 14, 2026
Pre-PR base synchronization
refs/remotes/origin/devat78a1864eef7fd1bbca991a8c0181832e432d088balready_current929c7382e588a8bd5c23b3d711e045dba48e5a6457462f0b4962fed3bbf4851cb097b6e739cbdb0dBrad-Edwards commentedon Oct 14, 2026
Pre-PR base synchronization
refs/remotes/origin/devat9cab8c0cd14d34ad67e610a1504cf99a3dc01bb1already_current39de0f2b98df59790403710f5ac0c4830538375e57462f0b4962fed3bbf4851cb097b6e739cbdb0dBrad-Edwards commentedon Oct 14, 2026
Final report — issue #1375 complete
PR: #1378
Outcome
Promotions from dev to main merge cleanly again. The dev ruleset now allows merge commits, main's release history is part of dev, and the release guide and back-merge PR tell the maintainer to use a merge commit for back-merges.
Join main's release history into dev and allow merge commits for back-merges.
Files changed
Modified:
pyproject.tomluv.lockReviews
Traceability reconciliation
Status