Repository: commons-math Updated Branches: refs/heads/develop 050dfa6f0 -> 12c9a0441
Development branch name is "develop". As per the blog post referred to in the "howto". Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/12c9a044 Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/12c9a044 Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/12c9a044 Branch: refs/heads/develop Commit: 12c9a04414e95257cf0309e96ae8e1db36affdf2 Parents: 050dfa6 Author: Gilles <[email protected]> Authored: Thu Feb 25 17:19:58 2016 +0100 Committer: Gilles <[email protected]> Committed: Thu Feb 25 17:19:58 2016 +0100 ---------------------------------------------------------------------- doc/development/development.howto.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-math/blob/12c9a044/doc/development/development.howto.txt ---------------------------------------------------------------------- diff --git a/doc/development/development.howto.txt b/doc/development/development.howto.txt index 3f1ff71..0e4512f 100644 --- a/doc/development/development.howto.txt +++ b/doc/development/development.howto.txt @@ -8,16 +8,16 @@ The conclusions reported here are based on ideas presented in this blog post: accepted commits are the result of a merge from the "release" branch (from a release candidate that passed a vote). 2. Contents that is candidate for being released must be merged into the - "release" branch, from the "development" branch. -3. The "development" branch collects all modifications that will be part + "release" branch, from the "develop" branch. +3. The "develop" branch collects all modifications that will be part of the next release. - Usually, changes should not be committed directly to the "development" + Usually, changes should not be committed directly to the "develop" branch; they should be merged from a branch specifically created for that purpose (see next point). 4. Work on an identified issue (bug fix or new feature) must be done in a new branch named after its corresponding report in the bug-tracking system (JIRA), e.g. "feature-MATH-1319". After completion, and in the absence of technical objections, the feature - branch is merged into the "development" branch, using the "--no-ff" git + branch is merged into the "develop" branch, using the "--no-ff" git option. That feature branch is then deleted.
