Repository: ant Updated Branches: refs/heads/master d02ecf6fe -> 55ddb5517
update for our 2-branch model Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/55ddb551 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/55ddb551 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/55ddb551 Branch: refs/heads/master Commit: 55ddb551710bda588206caba23e8b8ab0b15b856 Parents: d02ecf6 Author: Stefan Bodewig <bode...@apache.org> Authored: Sat Apr 9 12:11:26 2016 +0200 Committer: Stefan Bodewig <bode...@apache.org> Committed: Sat Apr 9 12:11:26 2016 +0200 ---------------------------------------------------------------------- CONTRIBUTING.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/55ddb551/CONTRIBUTING.md ---------------------------------------------------------------------- diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 79f94be..3f45cf2 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.
