From ca101da06a0b960285dcdd9935b5b95c90618d3f Mon Sep 17 00:00:00 2001 From: Myles Borins Date: Sun, 18 Nov 2018 12:27:43 -0500 Subject: [PATCH 1/5] doc: clarify who may land on an LTS staging branch Current language is a bit confusing --- COLLABORATOR_GUIDE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index 1eb75fc1f8d703..2a002dd0faa24f 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -802,7 +802,7 @@ pulled from the staging branch into the LTS branch only when a release is being prepared and may be pulled into the LTS branch in a different order than they were landed in staging. -Any Collaborator may land commits into a staging branch, but only the release +Any Collaborator may land commits into a non-LTS staging branch, but only the release team should land commits into the LTS branch while preparing a new LTS release. From ae50ca1d557e0b4d6c997d7924172be49bfc6e90 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sun, 18 Nov 2018 13:08:40 -0500 Subject: [PATCH 2/5] fixup: update text Co-Authored-By: MylesBorins --- COLLABORATOR_GUIDE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index 2a002dd0faa24f..0b1c8ded474417 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -802,7 +802,7 @@ pulled from the staging branch into the LTS branch only when a release is being prepared and may be pulled into the LTS branch in a different order than they were landed in staging. -Any Collaborator may land commits into a non-LTS staging branch, but only the release +Any Collaborator may land commits into a non-LTS staging branch. Only the release team should land commits into the LTS branch while preparing a new LTS release. From 63280081b735771200522b0a160cebf0910f228d Mon Sep 17 00:00:00 2001 From: Myles Borins Date: Sun, 18 Nov 2018 13:23:48 -0500 Subject: [PATCH 3/5] fixup: clarify further --- COLLABORATOR_GUIDE.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index 0b1c8ded474417..25fdaa00325caf 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -802,9 +802,8 @@ pulled from the staging branch into the LTS branch only when a release is being prepared and may be pulled into the LTS branch in a different order than they were landed in staging. -Any Collaborator may land commits into a non-LTS staging branch. Only the release -team should land commits into the LTS branch while preparing a new -LTS release. +Only the members of the @nodejs/backporters team should land commits into the +LTS branch. #### How can I help? From db735ad046b365c19b3f08158e1f2c58e9fbcdc6 Mon Sep 17 00:00:00 2001 From: Myles Borins Date: Sun, 18 Nov 2018 13:24:23 -0500 Subject: [PATCH 4/5] fixup: sigh --- COLLABORATOR_GUIDE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index 25fdaa00325caf..ad8a64ef6fef9a 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -803,7 +803,7 @@ being prepared and may be pulled into the LTS branch in a different order than they were landed in staging. Only the members of the @nodejs/backporters team should land commits into the -LTS branch. +LTS staging branch. #### How can I help? From 1df57da2d94a4087ba1fe62dd44ec4902912d3c0 Mon Sep 17 00:00:00 2001 From: Myles Borins Date: Sun, 18 Nov 2018 18:59:45 -0500 Subject: [PATCH 5/5] fixup: minor tweak from jasnell --- COLLABORATOR_GUIDE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index ad8a64ef6fef9a..276bc34da7d85b 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -802,8 +802,8 @@ pulled from the staging branch into the LTS branch only when a release is being prepared and may be pulled into the LTS branch in a different order than they were landed in staging. -Only the members of the @nodejs/backporters team should land commits into the -LTS staging branch. +Only the members of the @nodejs/backporters team should land commits onto +LTS staging branches. #### How can I help?