[Geany-devel] Plan ahead (to fail to plan is to plan to fail)
frank at xxxxx
Mon Oct 3 17:03:45 UTC 2011
On Mon, 03 Oct 2011 18:52:17 +0200
Colomban Wendling <lists.ban at herbesfolles.org> wrote:
> > 2. I agree with non-fast-forward merges of feature branches. These
> > branches however have to be real feature branches where work
> > concentrates on implementing a single feature (e.g. GTK 3 support).
> > For instance I have a branch for_review with random bugfixes and
> > minor features which shouldn't be treated as a feature branch and
> > which can even be rebased on top of master (If you have a look at
> > GTK, you see only a small number of merges - with bugfix-like
> > commits there's very small danger that someone else bases work on
> > them.)
> Yeah, agreed too. What I like in the blog post's workflow is that
> *every* single feature gets its own incubation branch, not only "big"
> ones. This cleans up "master" state, and makes reading the history
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 836 bytes
Desc: not available
More information about the Devel