Why is the merge tool disabled in Eclipse for a EGit-managed project?

eclipse git egit
Josh Glover picture Josh Glover · May 9, 2011 · Viewed 15.6k times · Source

As per the EGit User Guide, to use the merge tool, one should right-click on the resource with a merge conflict and then select Team > Merge Tool. However, when I do this, the Merge Tool option is greyed out. EGit is properly detecting the conflict and showing me both the icon and text label decorations for the file in conflict.

Any ideas?

Answer

Meisam picture Meisam · Jul 6, 2012

It was disabled for me because I had some changes on my stash list.

$ git stash clear

fixed the problem for me.

Related questions

'cannot open git-upload-pack' error in Eclipse when cloning or pushing git repository

I am not able to clone or push to a git repository at Bitbucket in Eclipse: It's weird, because a day before I didn't have any problem. I have downloaded the sts 3 times with no luck. This error keeps showing. …

Read More
How to resolve conflicts in EGit

I am using EGit on Eclipse v4.3 (Kepler). I want to commit and push my changes. I do a pull first and one file is conflicting. After manually resolving the conflict (local and remote are the same now), I am …

Read More
How do I set up Eclipse/EGit with GitHub?

I've never used Git before and would like to learn. I have a private repository with GitHub. I've installed the EGit plugin for Eclipse. I have a workspace where I do my work, generally: ~/Documents/workspace. I am able to …

Read More