Re: What to do with patches that should go upstream?

On Wed, Jan 13, 2010 at 3:43 PM, Junio C Hamano [off-list ref] wrote:

Jeenu V [off-list ref] writes:

quoted

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?

I don't see B in your picture, so I may not be answering the question you
wanted to ask, or you perhaps asked something other than the question you
wanted to ask.  Having said that, I think you are asking two more-or-less
independent questions.

Sorry, B was meant to be the branch at the bottom. But anyway I think
I got hints on what I needed. Thank you for your descriptive reply.

-- 
:J