From 19a692b7d2ffd603224e3e27d982abc536d3cb87 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sun, 2 Apr 2017 13:45:08 +0200 Subject: Update CONTRIBUTING Update version numbers, point out not to PR against release branches, point out rebase over merge. [ci skip] --- CONTRIBUTING.md | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'CONTRIBUTING.md') diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index aacb25bc5c..8ab4e87417 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,15 +11,20 @@ co-ordination. PHP welcomes pull requests to [add tests](#writing-tests), fix bugs and to implement RFCs. Please be sure to include tests as appropriate! -If you are fixing a bug, then please submit your PR against the lowest branch -of PHP that the bug affects, or the oldest fully supported version (the first -green branch on -[the supported version page](http://php.net/supported-versions.php). For -example, at the time of writing in mid-2015, this is PHP 5.5, which corresponds -to the `PHP-5.5` branch in Git. Please also make sure you add a link to the PR -in the bug on [the bug tracker](https://bugs.php.net/). - -Pull requests to implement RFCs should be submitted against `master`. +If you are fixing a bug, then please submit your PR against the lowest actively +supported branch of PHP that the bug affects (only green branches on +[the supported version page](http://php.net/supported-versions.php) are supported). +For example, at the time of writing in mid-2017, the lowest supported version is +PHP 7.0, which corresponds to the `PHP-7.0` branch in Git. Please also make sure you +add a link to the PR in the bug on [the bug tracker](https://bugs.php.net/). + +Pull requests implementing RFCs should be submitted against `master`. + +Pull requests should *never* be submitted against `PHP-x.y.z` branches, as +these are only used for release management. + +If your pull request exhibits conflicts with the base branch, please resolve them +by using `git rebase` instead of `git merge`. ## Filing bugs -- cgit v1.2.1