Repository navigation
docs(contributing): state the branch-refresh discipline — rebase in place, never hand-carry main - #693
Merged
Conversation
…lace, never hand-carry main Process guard recommended after the 2026-10-06 queue cleanup: four zombie PRs from rebase-as-new-PR, one fake merge inflating a PR diff by 11.5k replayed lines, and an evil-merge go.sum repair were all traced to the same two habits. The in-place recipe (rebase, verify, force-with-lease the original branch, close what you supersede) is now written down where contributors read before opening PRs.
Amperstrand
force-pushed
the
docs/rebase-in-place-guard
branch
from
October 6, 2026 21:21
1252ad1 to
c54e798
Compare
Contributor
|
Tag legend: pre-release-safe = land before the pre-release you are testing · ready = no blocker, timing is yours · post-release = hold until after · needs-author-pass = back to the author. TAG: ready — docs only ( One thing worth saying: the discipline this documents — rebase in place, never hand-carry It sits on the same commit stack as #692/#694/#695 (its base carries their commits). |
This was referenced Oct 6, 2026
c03rad0r
self-requested a review
October 6, 2026 21:41
c03rad0r
approved these changes
Oct 6, 2026
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
What
One new subsection in CONTRIBUTING (between the bug-fix-PR requirements and Merge mechanics) writing down the branch-refresh discipline, plus its changelog entry.
Why
The 2026-10-06 queue cleanup traced the whole mess to two habits:
go.sumthat equals neither parent; fix(packaging): the wired LAN ports get a bridge of their own, scoped to the admin surfaces #601 carried a repair commit for exactly that) and, done as a squash, a single-parent "merge" that replayed ~11.5k lines ofmaininto fix(vendor-ie): explicit 255-byte overflow policy — truncate, report, never silently diverge #620's diff;The recipe it prescribes
git rebase origin/main(ormerge --squashonto a fresh main),make go-battery+ the offline suites the diff touches, thengit push --force-with-leasethe original PR branch — and close what you supersede in the same action. Carried CHANGELOG entries belong under[Unreleased]with their PR link.Doc-only change; no code touched.