Skip to content

Commit

Permalink
Merge branch '4.8' into 5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastianbergmann committed Sep 2, 2015
2 parents 5d27ed7 + c0a9c60 commit 76899c0
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Expand Up @@ -11,6 +11,8 @@ Please note that this project is released with a [Contributor Code of Conduct](C
* Add tests for it. This is important so we don't break it in a future version unintentionally.
* Send a pull request. Bonus points for topic branches.

Please make sure that you have [set up your user name and email address](http://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 `master`.

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 76899c0

Please sign in to comment.