Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updated the doc for the branching changes

  • Loading branch information...
commit 48d89ed18761acd2c58454057e72bd9c581fac21 1 parent c23a602
@stof stof authored
Showing with 4 additions and 7 deletions.
  1. +3 −3 CONTRIBUTING.md
  2. +1 −4 README.md
View
6 CONTRIBUTING.md
@@ -7,16 +7,16 @@ Mink is an open source, community-driven project. If you'd like to contribute, f
- If you are going to make a big, substantial change, let's discuss it first
## Working with Pull Requests
-1. Create your feature addition or a bug fix branch based on `develop` branch (all new development happens here, `master` branch is for releases & hotfixes only) in your repository's fork.
+1. Create your feature addition or a bug fix branch based on `master` branch in your repository's fork.
2. Make necessary changes, but __don't mix__ code reformatting with code changes on topic.
3. Add tests for those changes (please look into `tests/` folder for some examples). This is important so we don't break it in a future version unintentionally.
4. Commit your code, but do not mess with `CHANGES.md`.
5. Squash your commits by topic to preserve a clean and readable log.
-6. Create Pull Request, but __remember__ always select `develop` branch as target, otherwise it will be closed.
+6. Create Pull Request.
# Running tests
Make sure that you don't break anything with your changes by running:
```bash
$> phpunit
-```
+```
View
5 README.md
@@ -4,10 +4,7 @@ Mink
[![Total Downloads](https://poser.pugx.org/behat/mink/downloads.png)](https://packagist.org/packages/behat/mink)
[![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/Behat/Mink/badges/quality-score.png?s=d4faf469d6b399df121deed6070390800722ada0)](https://scrutinizer-ci.com/g/Behat/Mink/)
[![Code Coverage](https://scrutinizer-ci.com/g/Behat/Mink/badges/coverage.png?s=88ab1cee4e131f4ef595f17ae4837001ef2aec3b)](https://scrutinizer-ci.com/g/Behat/Mink/)
-
-- [stable (master)](https://github.com/Behat/Mink) ([![Master Build
-Status](https://travis-ci.org/Behat/Mink.png?branch=master)](http://travis-ci.org/Behat/Mink)) - staging branch. Last stable version.
-- [development (develop)](https://github.com/Behat/Mink/tree/develop) ([![Develop Build Status](https://travis-ci.org/Behat/Mink.png?branch=develop)](http://travis-ci.org/Behat/Mink)) - development branch. Development happens here and you should send your PRs here too.
+[![Build Status](https://travis-ci.org/Behat/Mink.png?branch=master)](http://travis-ci.org/Behat/Mink)
Useful Links
------------
Please sign in to comment.
Something went wrong with that request. Please try again.