From 28c0f84a695790109c6f863986feae2726374fa5 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 30 Jan 2019 22:02:06 -0800 Subject: [PATCH] doc: remove redundant LTS/Current information in Collaborator Guide MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove bullet points about how breaking changes are handled in Current and LTS branches. * This information is covered in https://github.com/nodejs/Release#release-plan. * Having it here and in the above link means that the two may get out of sync, resulting in confusion. * The above link appears later in the doc in the LTS section. * Most Collaborators should not land *anything* in LTS branches and will almost never have a reason to land things into Current branches. They land stuff on the master branch. Adding this material here is confusing because it implies that Collaborators do land stuff on those branches. Save talk about those branches and how they're managed for later in the LTS section where it can be made clear that most Collaborators should not be landing code there anyway. PR-URL: https://github.com/nodejs/node/pull/25842 Reviewed-By: Michaël Zasso Reviewed-By: Richard Lau Reviewed-By: Colin Ihrig --- COLLABORATOR_GUIDE.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index acc8538219cf9b..3471ab4aac792f 100644 --- a/COLLABORATOR_GUIDE.md +++ b/COLLABORATOR_GUIDE.md @@ -278,14 +278,6 @@ providing a Public API in such cases. #### When Breaking Changes Actually Break Things -* Breaking changes should *never* land in Current or LTS except when: - * Resolving critical security issues. - * Fixing a critical bug (e.g. fixing a memory leak) requires a breaking - change. -* If a breaking commit does accidentally land in a Current or LTS branch, an - attempt to fix the issue will be made before the next release; If no fix is - provided then the commit will be reverted. - When any changes are landed on the master branch and it is determined that the changes *do* break existing code, a decision may be made to revert those changes either temporarily or permanently. However, the decision to revert or