diff options
| author | Stefan Bodewig <bodewig@apache.org> | 2016-04-09 12:11:26 +0200 |
|---|---|---|
| committer | Stefan Bodewig <bodewig@apache.org> | 2016-04-09 12:11:26 +0200 |
| commit | 55ddb551710bda588206caba23e8b8ab0b15b856 (patch) | |
| tree | b99c4cd3d1a0f2f7cb503360d99a4cd37af3c574 /CONTRIBUTING.md | |
| parent | d02ecf6fec116b2a97418c6365d35ecfc1d432d1 (diff) | |
| download | ant-55ddb551710bda588206caba23e8b8ab0b15b856.tar.gz | |
update for our 2-branch model
Diffstat (limited to 'CONTRIBUTING.md')
| -rw-r--r-- | CONTRIBUTING.md | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 79f94be82..3f45cf24c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,11 +23,24 @@ changes on the first. This way you can make sure you're not wasting your time on something that isn't considered to be in Ant's scope. +Branches +-------- + +The master branch is where we develop the next release of Ant 1.10.x - +any patch or PR against this branch must be buildable using Java8. + +The branch 1.9.x is where we develop the next release of Ant 1.9.x - +any patch or PR against this branch must be buildable using Java5. + +Please state clearly whether you are targeting 1.9.x or 1.10.x - +usually we port changes from 1.9.x to 1.10.x but not necessarily the +other way around. + Making Changes -------------- + Create a topic branch from where you want to base your work (this is - usually the master branch). + usually the master or the 1.9.x branch, see above). + Make commits of logical units. + Respect the original code style: + Only use spaces for indentation. |