+1 for trying a feature branch experiment. I totally agree with
criterial #1&2 below for branch creation although I don't quite
understand #3 as criteria.
I don't think we should do everything as a branch at least at the Apache
repo level. Certainly this is one reasonable way for people to do local
development.
Lastly we should consider the branch tracking and merge mechanisms, best
practices and rules. I don't have a ton of experience here with git.
On 7/9/14 10:55 AM, larry mccay wrote:
All -
I have been thinking about how to go about introducing branches for POCs or
features that are not quite ready for prime time.
Kevin and I have discussed it a bit offline and have a high level proposal
for it.
We can create feature branches that are named after jira that represent the
feature being worked on. We would probably want to keep the number of
branches to a minimum though. So, we could use something like the following
criteria:
1. when a feature is being POC'd or is a longer term effort it may overlap
with a branching for release therefore these should be in a feature branch
2. larger efforts that have a number of jira's associated with them should
be in a branch that represents the umbrella jira for the feature instead of
a branch per jira
3. features that are complete and ready for release can go directly into
master
Alternatively, we can also consider using local feature branches for every
jira - this would make working on multiple things at the same time
easier/cleaner - but will also necessarily involve more branch merges and
the like.
thoughts?
--larry
--
CONFIDENTIALITY NOTICE
NOTICE: This message is intended for the use of the individual or entity to
which it is addressed and may contain information that is confidential,
privileged and exempt from disclosure under applicable law. If the reader
of this message is not the intended recipient, you are hereby notified that
any printing, copying, dissemination, distribution, disclosure or
forwarding of this communication is strictly prohibited. If you have
received this communication in error, please contact the sender immediately
and delete it from your system. Thank You.
