Re: [sup-devel] branching and merging

[William Morgan <wmorgan-sup@masanjin.net>]

Reformatted excerpts from Hamish's message of 2011-02-10:
> But I'm wondering when a merge has been done from a branch, should
> development continue on that branch?

If it's essentially more work on the same feature, then yes, continue on that
branch. Otherwise, no. Branches are cheap.

The point of a feature branch is that you can merge or not merge or revert it
without touching other features. So that should be the deciding factor on
whether to start a new feature branch: if I have to throw away, or if I have to
revert this whole branch, will I be losing extra stuff?

The other option is that if it's a long-running set of related and dependent
features, you can also call it an integration branch, merge individual feature
branches into it as necessary, and finally merge the whole thing into master in
one go. I haven't been following the gpgme changes, but it sounds like maybe
this is the case.
-- 
William <wmorgan-sup@masanjin.net>
_______________________________________________
Sup-devel mailing list
Sup-devel@rubyforge.org
http://rubyforge.org/mailman/listinfo/sup-devel