Update CONTRIBUTING

Update version numbers, point out not to PR against release branches,
point out rebase over merge.

[ci skip]
This commit is contained in:
Nikita Popov 2017-04-02 13:45:08 +02:00
parent 3a890180d3
commit 19a692b7d2

View file

@ -11,15 +11,20 @@ co-ordination.
PHP welcomes pull requests to [add tests](#writing-tests), fix bugs and to PHP welcomes pull requests to [add tests](#writing-tests), fix bugs and to
implement RFCs. Please be sure to include tests as appropriate! 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 If you are fixing a bug, then please submit your PR against the lowest actively
of PHP that the bug affects, or the oldest fully supported version (the first supported branch of PHP that the bug affects (only green branches on
green branch on [the supported version page](http://php.net/supported-versions.php) are supported).
[the supported version page](http://php.net/supported-versions.php). For For example, at the time of writing in mid-2017, the lowest supported version is
example, at the time of writing in mid-2015, this is PHP 5.5, which corresponds PHP 7.0, which corresponds to the `PHP-7.0` branch in Git. Please also make sure you
to the `PHP-5.5` branch in Git. Please also make sure you add a link to the PR add a link to the PR in the bug on [the bug tracker](https://bugs.php.net/).
in the bug on [the bug tracker](https://bugs.php.net/).
Pull requests to implement RFCs should be submitted against `master`. 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 ## Filing bugs