From: Jeenu V <jeenuv@gmail.com>
To: git@vger.kernel.org
Subject: What to do with patches that should go upstream?
Date: Wed, 13 Jan 2010 15:21:11 +0530 [thread overview]
Message-ID: <5195c8761001130151q12ac636cnc69513087320195@mail.gmail.com> (raw)
Hi,
I'd like to know what's the best practice to follow when one discovers
that a change that's been applied on the current branch, has to
actually go upstream. For example, in the following figure,
A
-O---O-+
\ A' B'
-O---O---O---O---O---O---O W
/
-O----O--+
W is the current working branch. But there are commits A' and B' which
should go upstream. What I wanted to know is the next step from here.
1) Do I switch to A and B, and then cherry pick the commits A' and B'?
2) If I send the patch out to include in upstream, wouldn't it
conflict the next time I happen to merge from A or B?
Please suggest.
--
:J
next reply other threads:[~2010-01-13 9:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-13 9:51 Jeenu V [this message]
2010-01-13 10:13 ` What to do with patches that should go upstream? Junio C Hamano
2010-01-13 10:34 ` Jeenu V
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=5195c8761001130151q12ac636cnc69513087320195@mail.gmail.com \
--to=jeenuv@gmail.com \
--cc=git@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).