From: Peter Baumann Date: Wed, 17 Mar 2010 18:42:10 GMT Subject: Re: [PATCHv2] Teach --no-ff option to 'rebase -i'. Message-ID: <20100317184210.GB2557@m62s10.vlinux.de> In-Reply-To: <4BA0FE59.7020303@viscovery.net> On Wed, Mar 17, 2010 at 05:07:53PM +0100, Johannes Sixt wrote: > Peter Baumann schrieb: > > On Wed, Mar 17, 2010 at 07:59:19AM +0100, Johannes Sixt wrote: > >> If I were to re-merge topic into master a second time after this > >> situation, I would install a temporary graft that removes the second > >> parent of M and repeat the merge. After the graft is removed, the history > >> would look like this: > >> > >> B --- C --- D --------------. [topic] > >> / \ \ > >> A --- ... --- M ... --- U ... N [master] > >> > >> Are there any downsides? I don't know - I haven't thought it through. > >> > > > > Might be. If there is any branch starting anywhere in between M and U > > which also needs to merge [topic] will also cause you headaches :-) > > > > B --- C --- D --------------. [topic] > > / \ \ > > A --- ... --- M ... --- U ... N [master] > > \ > > x --- y [side_branch wich needs to merge topic] > > ?? I don't follow you. The side branch already contains the topic. What do > you want to merge? > Won't it loose the revert 'U' after merging side_branch back to master? Ah. Looking at the picture more closely, I could answer myself and say it would only cause a huge mergeconflict, won't it?. -- Peter