docs: the back-merge takes whichever shape dev earned - #86
Merged
Merged
Conversation
…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
Member
Author
|
No findings. Nothing fixed, nothing deferred. Recorded on the ledger item. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The
/releaseskill'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 intomain. Under the merge-commit policymainis a descendant ofdev-at-the-cut, so/ledger-land's merge oforigin/mainintodevfast-forwards whenever nothing landed ondevafter the cut, and makes a merge commit only when something did.The bullet at
.claude/skills/release/SKILL.md:74now names both shapes and keeps the changelog as the one conflict to expect, matching the workspace instruction inCLAUDE.mdand the wordingpipelex-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
/revpass 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
/releaseskill'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 ondevafter 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.