Skip to content

docs: the back-merge takes whichever shape dev earned - #86

Merged
lchoquel merged 1 commit into
devfrom
docs/Merge-rules-skill
Sep 9, 2026
Merged

lchoquel merged 1 commit into
devfrom
docs/Merge-rules-skill

Conversation

@lchoquel

@lchoquel lchoquel commented Sep 9, 2026 •

Copy link
Copy Markdown
Member

The /release skill's Particulars claimed the back-merge is always a merge commit and never a fast-forward. That was true only while release branches were squashed into main. Under the merge-commit policy main is a descendant of dev-at-the-cut, so /ledger-land's merge of origin/main into dev fast-forwards whenever nothing landed on dev after the cut, and makes a merge commit only when something did.

The bullet at .claude/skills/release/SKILL.md:74 now names both shapes and keeps the changelog as the one conflict to expect, matching the workspace instruction in CLAUDE.md and the wording pipelex-sdk-js's release skill already carries.

The rest of the skill was swept for the same assumption: the only other merge sentence is line 21, which holds under either shape. No changelog entry — a skill-only docs change gets none here, per #85.

One /rev pass at profile 1 (cubic), round 1, recorded on the item: no findings.

Closes L-260908-78bb9c

🤖 Generated with Claude Code

https://claude.ai/code/session_01JjRK9NyFp4vsif7LAFQmYz


Summary by cubic

Fixes the /release skill's back-merge description so it matches the actual behavior under the merge-commit policy: the bullet previously claimed the back-merge is always a merge commit, but it's now a fast-forward when nothing landed on dev after the cut, and a merge commit only when something did. The corrected bullet names both shapes and keeps the changelog as the one conflict to expect. A sweep of the skill found no other places with the same assumption. Closes L-260908-78bb9c.

Written for commit 4f05904. Summary will update on new commits.

Review in cubic

…akes whichever shape dev earned

The /release skill's Particulars claimed the back-merge is always a merge commit and never a fast-forward, which was true only while release branches were squashed into main. Under the merge-commit policy, main is a descendant of dev-at-the-cut, so /ledger-land's merge of origin/main into dev fast-forwards whenever nothing landed on dev after the cut, and makes a merge commit only when something did. The bullet now names both shapes and keeps the changelog as the one conflict to expect.

Closes L-260908-78bb9c

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01JjRK9NyFp4vsif7LAFQmYz
@lchoquel

lchoquel commented Sep 9, 2026

Copy link
Copy Markdown
Member Author

/rev profile 1 (quick), round 1 — reviewer: cubic (1.10.5, authenticated). Target: this branch against origin/dev, 2 changed lines in 1 file.

No findings. Nothing fixed, nothing deferred. Recorded on the ledger item.

@lchoquel
lchoquel merged commit d7243f9 into dev Sep 9, 2026
16 checks passed
@lchoquel
lchoquel deleted the docs/Merge-rules-skill branch September 9, 2026 07:29
@github-actions github-actions Bot locked and limited conversation to collaborators Sep 9, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant