Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 333091

Summary:	Merge tool doesn't become available
Product:	[Technology] EGit	Reporter:	Xavier Jodoin <xjodoin>
Component:	UI	Assignee:	Project Inbox <egit.ui-inbox>
Status:	RESOLVED FIXED	QA Contact:
Severity:	normal
Priority:	P3	CC:	frank.jakop, matthias.sohn, robin, strykre, tfletche, xjodoin
Version:	unspecified
Target Milestone:	2.3
Hardware:	PC
OS:	Linux
Whiteboard:

Description Xavier Jodoin

2010-12-22 09:25:01 EST

Build Identifier: 20100917-0705

I have one repo git with two eclipse project inside when my repo become in conflit mode I can't use merge tool because the menu is always disable.

Reproducible: Always

Steps to Reproduce:
1.create two eclipse project in git repo
2.import project from git repo
3.create merge conflit

Comment 1 Matthias Sohn

2010-12-23 04:19:35 EST

Which egit version are you using ?
Did you try with the new EGit 0.10 ?

Comment 2 Xavier Jodoin

2010-12-23 08:58:22 EST

I use the nigthly build org.eclipse.egit.core_0.11.0.201012211404.jar

Comment 3 Frank Jakop

2011-05-06 11:16:22 EDT

still with EGit 1.0.0.201105051713, very annoying

Comment 4 Casey Johnson

2012-01-24 22:11:02 EST

I am having the same issue, both on Windows 7 (SP1) and on Linux. I find that if I perform a Git merge in the Eclipse UI then the Merge Tool option is available for conflict resolution. However, if I do the merge through the command line then the Merge Tool option is greyed, even though Eclipse recognizes that there was a merge conflict.

Incidentally, I think this may be related to Bug #359788.

Comment 5 Robin Stocker

2013-05-03 12:29:09 EDT

The implementation of this was changed in bug 376135, this problem should be fixed in EGit 2.3.1. Feel free to reopen if it still exists. Use the following update site to update to 2.3.1:

http://download.eclipse.org/egit/updates