@@ -687,8 +687,8 @@ git push upstream master
687
687
messages. You are only allowed to force push to any Node.js branch within 10
688
688
minutes from your original push. If someone else pushes to the branch or the
689
689
10-minute period passes, consider the commit final.
690
- * Use ` --force-with-lease ` to minimize the chance of overwriting
691
- someone else's change.
690
+ * Use ` --force-with-lease ` to reduce the chance of overwriting someone else's
691
+ change.
692
692
* Post to ` #node-dev ` (IRC) if you force push.
693
693
694
694
### Long Term Support
@@ -701,35 +701,19 @@ versions. You can find more information
701
701
a branch enters LTS, the release plan limits the types of changes permitted in
702
702
the branch.
703
703
704
- #### Landing semver-minor commits in LTS
705
-
706
- The default policy is to not land semver-minor or higher commits in any LTS
707
- branch. However, the LTS WG or TSC can evaluate any individual semver-minor
708
- commit and decide whether a special exception ought to be made. It is
709
- expected that such exceptions would be evaluated, in part, on the scope
710
- and impact of the changes on the code, the risk to ecosystem stability
711
- incurred by accepting the change, and the expected benefit that landing the
712
- commit will have for the ecosystem.
713
-
714
- Any Collaborator who feels a semver-minor commit should be landed in an LTS
715
- branch should attach the ` lts-agenda ` label to the pull request. The LTS WG
716
- will discuss the issue and, if necessary, will escalate the issue up to the
717
- TSC for further discussion.
718
-
719
704
#### How are LTS Branches Managed?
720
705
721
- There are multiple LTS branches, e.g. ` v10.x ` and ` v8.x ` . Each of these is
722
- paired with a staging branch: ` v10.x-staging ` and ` v8.x-staging ` .
706
+ Each LTS release has a corresponding branch ( v10.x, v8.x, etc.). Each also has a
707
+ corresponding staging branch ( v10.x-staging, v8.x-staging, etc.) .
723
708
724
- As commits land on the master branch, they are cherry-picked back to each
725
- staging branch as appropriate. If the commit applies only to the LTS branch, the
726
- PR must be opened against the * staging* branch. Commits are selectively
727
- pulled from the staging branch into the LTS branch only when a release is
728
- being prepared and may be pulled into the LTS branch in a different order
729
- than they were landed in staging.
709
+ Commits that land on master are cherry-picked to each staging branch as
710
+ appropriate. If a change applies only to the LTS branch, open the PR against the
711
+ * staging* branch. Commits from the staging branch land on the LTS branch only
712
+ when a release is being prepared. They may land on the LTS branch in a different
713
+ order than they were in staging.
730
714
731
- Only the members of the @nodejs/backporters team should land commits onto
732
- LTS staging branches.
715
+ Only members of @nodejs/backporters should land commits onto LTS staging
716
+ branches.
733
717
734
718
#### How can I help?
735
719
0 commit comments