From: William Morgan <wmorgan-sup@masanjin.net>
To: sup-devel <sup-devel@rubyforge.org>
Subject: Re: [sup-devel] branching and merging
Date: Fri, 11 Feb 2011 00:01:17 +0000 [thread overview]
Message-ID: <1297381879-sup-6069@masanjin.net> (raw)
In-Reply-To: <1297380057-sup-9005@whisper>
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
prev parent reply other threads:[~2011-02-11 0:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-10 23:26 Hamish
2011-02-11 0:01 ` William Morgan [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1297381879-sup-6069@masanjin.net \
--to=wmorgan-sup@masanjin.net \
--cc=sup-devel@rubyforge.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox