Skip to content

Commit 78e6ec7

Browse files
Trotttargos
authored andcommitted
doc: edit LTS material in Collaborator Guide
* Rewrite some material for simplicity and directness. * Remove outdated LTS material in the Collaborator Guide. (For example, refers to LTS WG for things that are now handled by the Release WG.) * Minor change to text about force pushing (s/minimize/reduce/). PR-URL: #26845 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent 352c31c commit 78e6ec7

File tree

1 file changed

+11
-27
lines changed

1 file changed

+11
-27
lines changed

COLLABORATOR_GUIDE.md

+11-27
Original file line numberDiff line numberDiff line change
@@ -629,8 +629,8 @@ git push upstream master
629629
messages. You are only allowed to force push to any Node.js branch within 10
630630
minutes from your original push. If someone else pushes to the branch or the
631631
10-minute period passes, consider the commit final.
632-
* Use `--force-with-lease` to minimize the chance of overwriting
633-
someone else's change.
632+
* Use `--force-with-lease` to reduce the chance of overwriting someone else's
633+
change.
634634
* Post to `#node-dev` (IRC) if you force push.
635635

636636
### Long Term Support
@@ -643,35 +643,19 @@ versions. You can find more information
643643
a branch enters LTS, the release plan limits the types of changes permitted in
644644
the branch.
645645

646-
#### Landing semver-minor commits in LTS
647-
648-
The default policy is to not land semver-minor or higher commits in any LTS
649-
branch. However, the LTS WG or TSC can evaluate any individual semver-minor
650-
commit and decide whether a special exception ought to be made. It is
651-
expected that such exceptions would be evaluated, in part, on the scope
652-
and impact of the changes on the code, the risk to ecosystem stability
653-
incurred by accepting the change, and the expected benefit that landing the
654-
commit will have for the ecosystem.
655-
656-
Any Collaborator who feels a semver-minor commit should be landed in an LTS
657-
branch should attach the `lts-agenda` label to the pull request. The LTS WG
658-
will discuss the issue and, if necessary, will escalate the issue up to the
659-
TSC for further discussion.
660-
661646
#### How are LTS Branches Managed?
662647

663-
There are multiple LTS branches, e.g. `v10.x` and `v8.x`. Each of these is
664-
paired with a staging branch: `v10.x-staging` and `v8.x-staging`.
648+
Each LTS release has a corresponding branch (v10.x, v8.x, etc.). Each also has a
649+
corresponding staging branch (v10.x-staging, v8.x-staging, etc.).
665650

666-
As commits land on the master branch, they are cherry-picked back to each
667-
staging branch as appropriate. If the commit applies only to the LTS branch, the
668-
PR must be opened against the *staging* branch. Commits are selectively
669-
pulled from the staging branch into the LTS branch only when a release is
670-
being prepared and may be pulled into the LTS branch in a different order
671-
than they were landed in staging.
651+
Commits that land on master are cherry-picked to each staging branch as
652+
appropriate. If a change applies only to the LTS branch, open the PR against the
653+
*staging* branch. Commits from the staging branch land on the LTS branch only
654+
when a release is being prepared. They may land on the LTS branch in a different
655+
order than they were in staging.
672656

673-
Only the members of the @nodejs/backporters team should land commits onto
674-
LTS staging branches.
657+
Only members of @nodejs/backporters should land commits onto LTS staging
658+
branches.
675659

676660
#### How can I help?
677661

0 commit comments

Comments
 (0)