Permalink
Browse files

Discuss branching strategy

  • Loading branch information...
1 parent 3666d14 commit 9ea40edb48b1cdf3ed02c454b822b175724881fa @beberlei beberlei committed Nov 17, 2012
Showing with 10 additions and 0 deletions.
  1. +10 −0 CONTRIBUTING.md
View
@@ -6,6 +6,16 @@ Before we can merge your Pull-Request here are some guidelines that you need to
These guidelines exist not to annoy you, but to keep the code base clean,
unified and future proof.
+## We only accept PRs to "master"
+
+Our branching strategy is summed up with "everything to master first", even
+bugfixes and we then merge them into the stable branches. You should only
+open pull requests against the master branch. Otherwise we cannot accept the PR.
+
+There is one exception to the rule, when we merged a bug into some stable branches
+we do occasionally accept pull requests that merge the same bug fix into earlier
+branches.
+
## Coding Standard
We use PSR-1 and PSR-2:

0 comments on commit 9ea40ed

Please sign in to comment.