From: Hamish <dmishd@gmail.com>
To: sup-devel <sup-devel@rubyforge.org>
Subject: [sup-devel] branching and merging
Date: Thu, 10 Feb 2011 23:26:29 +0000 [thread overview]
Message-ID: <1297380057-sup-9005@whisper> (raw)
Hello
I'm wondering if there are preferred strategies for the feature branches.
I'm aware that new branches should be branched off master, and merged into
next when the author thinks they're ready. But I'm wondering when a merge has
been done from a branch, should development continue on that branch?
I've been working on the gpgme branch, even though a number of the earlier
commits on that branch have been merged into master. So I've been using git
cherry-pick to merge later commits into next. Is that a reasonable way to go
or should I be starting lots of little branches, or merging into next less
often? Or does it just not make much difference to the maintainers and I
should do what works for me?
Any opinions?
Hamish
_______________________________________________
Sup-devel mailing list
Sup-devel@rubyforge.org
http://rubyforge.org/mailman/listinfo/sup-devel
next reply other threads:[~2011-02-10 23:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-10 23:26 Hamish [this message]
2011-02-11 0:01 ` William Morgan
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=1297380057-sup-9005@whisper \
--to=dmishd@gmail.com \
--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