blob: f2648c47c7a2f4b033d2ba119c8604703f34becd [file] [log] [blame]
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# See the License for the specific language governing permissions and
# limitations under the License.
This document summarizes a discussion that took place on the "dev" ML: and
The conclusions reported here are based on ideas presented in this blog post:
1. A tag in git will represent a full release (from a release candidate that
passed a vote). Note, this tag will not have the suffix "RC#", as tags
with that suffix represent a release candidate.
2. Contents that is candidate for being released must be merged into the
"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 "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 "master" branch, using the "--no-ff" git
That feature branch is then deleted.