From 23a03051839b026fb2be2f4f5cdc98665de49ceb Mon Sep 17 00:00:00 2001 From: Michael Cullum Date: Sun, 18 Feb 2018 19:21:30 +0000 Subject: [PATCH 1/2] Update CONTRIBUTING.md --- CONTRIBUTING.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8650e290d..375dafb25 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -20,13 +20,12 @@ given according to the current bylaws of this group. # Merge & Access Policy -All Editors, Coordinators and Sponsors of specifications in draft & review stage +All Editors, Sponsors and WG members of specifications in draft & review stage have access to push to this (php-fig/fig-standards) repository; subject to secretary discretion -All Editors, Coordinators and Sponsors of specifications have push access to utility -and interface repositories and retrain this even after acceptance; subject to secretary -discretion. +All Editors and Sponsors of specifications have push access to utility and interface +repositories and retrain this even after acceptance; subject to secretary discretion. The master branch of all repositories are protected and therefore cannot be forced pushed to. @@ -43,8 +42,8 @@ directly (excluding inital commits on new interface/util repositories) to master comment) or merged by the PSR Editor, except in the review phase when the coordinator should seek commment from the editor, but merging is at the coordinator's discretion * You must never merge a pull request that affects any file in the repository -other than those you are on a working group for; you should request a secretary -or member of that working group (mention @php-fig/psr-x) do so +other than those you are on a working group for unless you are a secretary; you should +request a secretary or member of that working group (mention @php-fig/psr-x) do so * You should never merge your own pull request * A change should never be merged to an accepted PSR without approval from secretaries, who will attempt to seek confirmation from the former Editors @@ -66,7 +65,7 @@ access. Merge access is a privilege and not a right. # Tagging Tagging on utility and interface repository should be done regularly, ideally after -every merge, or every batch of merges after PSR approval. +every merge, or every batch of merges after PSR approval; and on PSR approval. Versioning should follow semantic versioning and primarily just be simple patch fix increments (following semantic versioning). The first 1.0.0 tag should be From 7a2fb68095ef7b7885fdaad5094ab4a208ab8579 Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Tue, 30 Oct 2018 15:12:55 +0100 Subject: [PATCH 2/2] Apply fixes as per reviews --- CONTRIBUTING.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 375dafb25..a5944a712 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -25,7 +25,7 @@ have access to push to this (php-fig/fig-standards) repository; subject to secretary discretion All Editors and Sponsors of specifications have push access to utility and interface -repositories and retrain this even after acceptance; subject to secretary discretion. +repositories and retain this even after acceptance; subject to secretary discretion. The master branch of all repositories are protected and therefore cannot be forced pushed to. @@ -42,8 +42,8 @@ directly (excluding inital commits on new interface/util repositories) to master comment) or merged by the PSR Editor, except in the review phase when the coordinator should seek commment from the editor, but merging is at the coordinator's discretion * You must never merge a pull request that affects any file in the repository -other than those you are on a working group for unless you are a secretary; you should -request a secretary or member of that working group (mention @php-fig/psr-x) do so +other than those you are on a working group for; you should request a secretary +or member of that working group (mention @php-fig/psr-x) do so * You should never merge your own pull request * A change should never be merged to an accepted PSR without approval from secretaries, who will attempt to seek confirmation from the former Editors @@ -64,8 +64,8 @@ access. Merge access is a privilege and not a right. # Tagging -Tagging on utility and interface repository should be done regularly, ideally after -every merge, or every batch of merges after PSR approval; and on PSR approval. +Tagging on utility and interface repository should be done regularly, ideally +on PSR approval and after every subsequent merge (or batch of merges). Versioning should follow semantic versioning and primarily just be simple patch fix increments (following semantic versioning). The first 1.0.0 tag should be