blob: eecf2b4d1e6d49e3e5981b98298a08ab613842c6 [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
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
This document summarizes the development process of Commons Numbers:
1. The "master" branch collects all modifications that will be part
of the next release.
Usually, non trivial 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).
2. 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-NUMBERS-123".
After completion, and in the absence of technical objections, the feature
branch is merged into the "master" branch, using the "--no-ff" git
option.
That feature branch is then deleted.