accumulo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Steve Loughran <>
Subject Re: Gitflow
Date Mon, 14 Oct 2013 09:32:23 GMT
I've been playing with gitflow on our Hoya tool to start HBase or Accumulo

 -it provides a cleaner history of what's going on
 -release process seems good
 -good for hotfixes when and how they got merged into develop and master
 -it becomes a consistent workflow for multiple projects
 -tool support, both command line and Atlassian Source tree

 -all the gitflow diagrams show perfect isolation of feature branches until
merge time. If you really do isolate yourself from the core dev stream then
your merge costs are higher/more traumatic
 -making a non-feature related change while you are working on a feature
becomes complex. You can switch to develop, create a new feature branch,
complete that, & merge it in -but how to get it back into your original
feature branch? Either you merge in that feature direct, or you merge the
whole of develop in.

Isolating yourself from trunk dev for any length of time on an active
project is dangerous because you slowly diverge. You can always merge
--rebase if you are developing in private, but the moment you share that
branch for others, you can't rebase any more.

I can't see how to effectively use gitflow to work on features while
tracking develop without creating far messier commit graph than it ever

Then there's the problem of feature-on-feature when you want to separate
two bits of work at commit time, but which you are trying to co-dev purely
because they are related.


On 11 October 2013 15:32, Benson Margulies <> wrote:

> I have a little favor to ask. I read the discussion about git process
> with ignorant interest some months back, and now I am in the process
> of trying to use gitflow with a team myself, and feeling a bit
> puzzled. Would any of the folks who were providing guidance here be
> willing to entertain some questions from me?

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.

  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message