root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Instruct contributors to branch from master

This commit is contained in:
Chris Beams 2013-05-28 13:54:14 +03:00
parent 00fea1f715
commit 3c73a8fc4f
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CONTRIBUTING.md
View File

@ -47,13 +47,11 @@ future pull requests as well, simply so that the Spring Framework team knows
immediately that this process is complete. immediately that this process is complete.
## Create your branch from `3.2.x` ## Create your branch from `master`
If your pull request addresses a bug or improvement, please create your branch Master currently represents work toward Spring Framework 4.0. Please submit
from Spring Framework's `3.2.x` branch. `master` is reserved for work on new features all pull requests there, even bug fixes and minor improvements. Backports to
for the next major version of the framework. Rest assured that if your pull `3.2.x` will be considered on a case-by-case basis.
request is accepted and merged into `3.2.x`, these changes will also eventually
be merged into `master`.
## Use short branch names ## Use short branch names
@ -129,7 +127,7 @@ e.g.
* ... * ...
* *
* @author First Last * @author First Last
* @since 3.2 * @since 4.0
* @see ... * @see ...
*/ */
``` ```