chore: update branching conventions in /doc
Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/6ddd71b0 Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/6ddd71b0 Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/6ddd71b0 Branch: refs/heads/master Commit: 6ddd71b06133c8656200f82c75b71df549198fb0 Parents: 6348d47 Author: Rob Tompkins <christopher.tompk...@capitalone.com> Authored: Tue Sep 20 14:11:24 2016 -0400 Committer: Rob Tompkins <christopher.tompk...@capitalone.com> Committed: Tue Sep 20 14:11:24 2016 -0400 ---------------------------------------------------------------------- doc/development/development.howto.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-math/blob/6ddd71b0/doc/development/development.howto.txt ---------------------------------------------------------------------- diff --git a/doc/development/development.howto.txt b/doc/development/development.howto.txt index 0e4512f..7b5ec93 100644 --- a/doc/development/development.howto.txt +++ b/doc/development/development.howto.txt @@ -1,5 +1,6 @@ This document summarizes a discussion that took place on the "dev" ML: - http://markmail.org/message/7lnus64entdwj4vo + http://markmail.org/message/7lnus64entdwj4vo and + http://markmail.org/message/3xjj2g74ga4iyijg The conclusions reported here are based on ideas presented in this blog post: http://nvie.com/posts/a-successful-git-branching-model/ @@ -8,16 +9,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 "develop" branch. -3. The "develop" branch collects all modifications that will be part + "release" branch, from the "master" branch. +3. The "master" branch collects all modifications that will be part of the next release. - Usually, changes should not be committed directly to the "develop" + Usually, changes should not be committed directly to the "master" 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 "develop" branch, using the "--no-ff" git + branch is merged into the "master" branch, using the "--no-ff" git option. - That feature branch is then deleted. + That feature branch is then deleted. \ No newline at end of file
