https://interfaces3.hunter.cryptograss.live/index.php?action=history&feed=atom&title=VersionControl%3APRs%2Fmagenta%2F460 VersionControl:PRs/magenta/460 - Revision history 2026-11-15T07:15:05Z Revision history for this page on the wiki MediaWiki 1.43.6 https://interfaces3.hunter.cryptograss.live/index.php?title=VersionControl:PRs/magenta/460&diff=16072&oldid=prev DrivingThatTrain: cryptograss/magenta#460, as GitHub has it 2026-11-11T10:10:02Z <p>cryptograss/magenta#460, as GitHub has it</p> <table style="background-color: #fff; color: #202122;" data-mw="interface"> <col class="diff-marker" /> <col class="diff-content" /> <col class="diff-marker" /> <col class="diff-content" /> <tr class="diff-title" lang="en"> <td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">← Older revision</td> <td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">Revision as of 10:10, 11 November 2026</td> </tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l5">Line 5:</td> <td colspan="2" class="diff-lineno">Line 5:</td></tr> <tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|url=https://github.com/cryptograss/magenta/pull/460</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|url=https://github.com/cryptograss/magenta/pull/460</div></td></tr> <tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|author=magent-cryptograss</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|author=magent-cryptograss</div></td></tr> <tr><td class="diff-marker" data-marker="−"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>|state=<del style="font-weight: bold; text-decoration: none;">open</del></div></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div>|state=<ins style="font-weight: bold; text-decoration: none;">merged</ins></div></td></tr> <tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|base=main</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|base=main</div></td></tr> <tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|branch=magent/merge-base-gone</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|branch=magent/merge-base-gone</div></td></tr> <tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|opened=2026-11-10 14:14:35</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|opened=2026-11-10 14:14:35</div></td></tr> <tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|pushed=2026-11-10 14:14:22</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|pushed=2026-11-10 14:14:22</div></td></tr> <tr><td class="diff-marker" data-marker="−"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>|merged=</div></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div>|merged=<ins style="font-weight: bold; text-decoration: none;">2026-11-11 10:09:58</ins></div></td></tr> <tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|closed=</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|closed=</div></td></tr> <tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|worked_on_by=magent, justin</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>|worked_on_by=magent, justin</div></td></tr> </table> DrivingThatTrain https://interfaces3.hunter.cryptograss.live/index.php?title=VersionControl:PRs/magenta/460&diff=15831&oldid=prev DrivingThatTrain: cryptograss/magenta#460, as GitHub has it 2026-11-10T14:14:40Z <p>cryptograss/magenta#460, as GitHub has it</p> <p><b>New page</b></p><div>{{PR<br /> |repo=magenta<br /> |number=460<br /> |title=Merge sheet: a stacked PR whose base merged says to rebase, not &quot;has no … here&quot;<br /> |url=https://github.com/cryptograss/magenta/pull/460<br /> |author=magent-cryptograss<br /> |state=open<br /> |base=main<br /> |branch=magent/merge-base-gone<br /> |opened=2026-11-10 14:14:35<br /> |pushed=2026-11-10 14:14:22<br /> |merged=<br /> |closed=<br /> |worked_on_by=magent, justin<br /> |moods=interfaces<br /> |deploy=redeploy maybelle (memory-lane); no migrations<br /> }}<br /> &lt;pre class=&quot;pr-body&quot;&gt;Justin, 10 Nov (#interfaces): pressing Merge on #453 said &quot;magenta has no magent/candidates here&quot;. #453 was stacked on #451&#039;s branch. When #451 merged, githouse moved that branch to `refs/merged/`, which left the sheet nothing to merge into. Justin: &quot;Can we have a more coherent error in that situation then?&quot;<br /> <br /> The sheet now says why and what to do:<br /> <br /> - **The base merged or was closed:** &quot;magenta#453 is built on magent/candidates, which has merged since, so there is nothing to merge it into. Its author rebases it onto main and points its pull request at main; then it can merge.&quot; It says &quot;was closed&quot; if the base was deleted without merging. The branch it names to rebase onto is the repository&#039;s deploy branch, or main.<br /> - **Base missing for any other reason:** &quot;magenta#N is to merge into X, and githouse has no magenta:X&quot;.<br /> - **githouse doesn&#039;t hold the branch at all:** previously &quot;githouse has no magenta:B&quot;. Now it adds: &quot;its author pushes it to githouse (the hunter remote), then it can merge here&quot;. #453 was also in this state until I pushed it this morning.<br /> <br /> **Tests:** new `test_one_stacked_on_a_branch_that_merged_says_to_rebase` checks the exact words. The full suite passes: 1,949 tests OK.<br /> <br /> Deploy: redeploy maybelle (memory-lane); no migrations<br /> Worked on by: magent, justin, in #interfaces&lt;/pre&gt;</div> DrivingThatTrain