Eclipse Community Forums: EGit » Any way to launch a three-way merge with EGit?

Help

Home

Home » Eclipse Projects » EGit » Any way to launch a three-way merge with EGit?

Show: Today's Messages :: Show Polls :: Message Navigator

Any way to launch a three-way merge with EGit? [message #964537]

Tue, 30 October 2012 11:55

Laurent Goubet
Messages: 1548
Registered: July 2009

Senior Member

Hi,

Try as I might, I have not found any way to launch a three-way comparison with EGit. The synchronize view seems to do it, but It seems to me that the "ancestor" of this comparison is always the "remote" side, which means that "synchronize workspace" will never detect any conflicts, even if there are some.

right-click > compare with > branch, tag... also does a two way comparison : left being the local version, right the other branch's... but no common ancestor is taken into account, thus no conflict detection there either.

Is there any reason for this choice? Is this something that is meant to evolve later on? Or is there something I've missed Smile

?

Laurent Goubet
Obeo

Report message to a moderator

[Message index]

		Any way to launch a three-way merge with EGit? By: Laurent Goubet on Tue, 30 October 2012 11:55
		Re: Any way to launch a three-way merge with EGit? By: Stefan Lay on Fri, 02 November 2012 03:37
		Re: Any way to launch a three-way merge with EGit? By: Stefan Lay on Fri, 02 November 2012 09:51
		Re: Any way to launch a three-way merge with EGit? By: Stefan Lay on Wed, 14 November 2012 05:26
		Re: Any way to launch a three-way merge with EGit? By: Laurent Goubet on Thu, 22 November 2012 04:46

Previous Topic:	Force using JSch instead of TortoisePlink on Windows ?
Next Topic:	Pull and MERGE_RESOLVED Questions

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Sat May 25 08:49:35 EDT 2013