Skip to content

Commit

Permalink
Merge branch '6.5' into 7.5
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastianbergmann committed Jan 17, 2019
2 parents ff7b937 + 706c004 commit 1d56f4b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Please note that this project is released with a [Contributor Code of Conduct](C

Please make sure that you have [set up your user name and email address](https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup) for use with Git. Strings such as `silly nick name <root@localhost>` look really stupid in the commit history of a project.

Pull requests for bug fixes must be based on the current stable branch whereas pull requests for new features must be based on the `master` branch.
Pull requests for bug fixes must be made for the oldest branch that is [supported](https://phpunit.de/supported-versions.html). Pull requests for new features must be based on the `master` branch.

We are trying to keep backwards compatibility breaks in PHPUnit to an absolute minimum. Please take this into account when proposing changes.

Expand Down

0 comments on commit 1d56f4b

Please sign in to comment.