From 92c13f0932e00eba191eeb85c9a25cbab472fd4f Mon Sep 17 00:00:00 2001 From: Andreas Trawoeger Date: Fri, 30 Oct 2026 04:58:04 +0100 Subject: [PATCH] docs: the record says how many trailers the landed commit carries, and it says one MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The CHANGELOG record for PR #60 carried a claim that the landing falsified: "GitHub's squash composes the landed message from the branch's commit messages in order, so the landed commit carries both". Measured on the landed commit ee7962bb, GitHub's squash composed the message from the branch's NON-MERGE commit messages only, so the landed commit carries ONE trailer — the content author's — and the merge commit's message, with this session's trailer, is not carried into it. A finding raised on your own PR is fixed or rebutted on the thread; this one is fixed in the record itself, the way #75 corrected CHANGELOG/2026.302.0039.md, because the record is where the next reader looks. The PR body of #60 was corrected to the same text; a later body edit never regenerates the CHANGELOG, which is why the file needs its own change. Assisted-by: Claude Code minimax/minimax-m3.1-flash:cloud (documentation reviewed) --- CHANGELOG/2026.303.0348.md | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGELOG/2026.303.0348.md b/CHANGELOG/2026.303.0348.md index bc45ad8..8ad7dd1 100644 --- a/CHANGELOG/2026.303.0348.md +++ b/CHANGELOG/2026.303.0348.md @@ -234,11 +234,21 @@ Harness `Claude Code`, model `minimax/minimax-m3.1-flash:cloud` — the pair the change is prose-only, so the tier is the prose tier: `documentation reviewed`. The runtime gates above were run and are pasted in full, but a runtime tier is not claimed for a comment-only change. -**Two trailers, honestly.** The branch's own content commit `7e4d5fd` was authored in an earlier +**The trailers, measured.** The branch's own content commit `7e4d5fd` was authored in an earlier session and keeps ITS trailer (`DeepSeek Harness deepseek-v4.1-flash`); the pushed head `1756c8c` -is a merge commit written by this session and carries this session's trailer. GitHub's squash +is a merge commit written by this session and carries this session's trailer. **MEASURED on the +landing: GitHub's squash composes the landed message from the branch's NON-MERGE commit messages +only, so the landed commit `ee7962bb` carries ONE trailer — the content author's — and the merge +commit's message, with this session's trailer, is not carried into it.** The landed attribution is +the content author's, which is correct for the change the commit carries. + +*Corrected after the merge.* The sentence that introduced this section said *"GitHub's squash composes the landed message from the branch's commit messages in order, so the landed commit -carries both — each session's own authorship, neither overwritten. +carries both — each session's own authorship, neither overwritten"*, which was false: GitHub composes +the squash message from the branch's **non-merge** commit messages, so the landed commit `ee7962bb` +carries ONE trailer — the content author's — and the merge commit `1756c8c`'s own message, with the +takeover session's trailer, is not carried into it. The measurement was taken on the landing itself, +and the wording was corrected here — in the record, not only in the pull request. Agent: charly