15

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?

Josh Glover
  • 25,142
  • 27
  • 92
  • 129

6 Answers6

2

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

$ git stash clear

fixed the problem for me.

Meisam
  • 21
  • 2
1

The only time (other than a bug) that the Merge Tool would be disabled is that when you are in any status other than the Conflicts one; i.e. you will only see that option enabled when the status is Conflicts. The status is shown next to the project name in most views, such as Project Explorer and Synchronize.

Make sure you have merged with desired branch, then if your merge results in conflicts, your project will enter Conflicts mode, and the Merge Tool will be enabled.

Community
  • 1
  • 1
solimant
  • 809
  • 9
  • 15
1

It seems to be a bug in EGit as VonC mentioned, but the fix is easy. I did it using reset branch option on the same menu that Cherry Pick option existed. enter image description here

Note: git stash clear didn't help.

mohghaderi
  • 2,520
  • 1
  • 19
  • 12
1

It can depend on the version of EGit you are using, and on the operation that lead to the conflict.
See for instance bug 339092 which mention merge tool being not enabled in the case of a conflict after cherry-picking: only the just released EGit 0.12 would support that.

VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
  • 1
    Hrm, this was after a `git pull --rebase`, but one I did from the command line. I wonder if that could be the issue, since I didn't do it through Eclipse. I am already using 0.12.1, in any case. – Josh Glover May 09 '11 at 09:36
  • @Josh: interesting. Then some kind of project refresh issue, perhaps? – VonC May 09 '11 at 09:50
  • I'll certainly keep you posted. :) – Josh Glover May 09 '11 at 10:08
  • There is also the problem that it was never enabled for conflicts caused by unstashing, see [bug 376135](https://bugs.eclipse.org/bugs/show_bug.cgi?id=376135). The fix for that is currently in review and may also fix other such cases. – robinst Oct 24 '12 at 12:56
0

This happens if you tried to push changes to a remote and there were merges required from the remote. It fails with 'not FF' but also simultaneously detects the conflict. Don't ask me why it doesn't mark the whole project as conflicted at this point.

Open the Synchronize tab, right-click the project and select 'merge'. This immediately fails because of the conflicting file, and it switches on the conflict icon label for the project and enables the 'merge tool' option.

This is for EGit 4.0.3 in Eclipse Mars.

Adam
  • 5,215
  • 5
  • 51
  • 90
0

This also happens if you're in detached head state (in my case, I had checked out a remote branch and then forgotten).

Also, even after you've corrected the problem, you may have to select a different project and then reselect the one you actually want (just selecting in the package explorer view) in order for the menu to update.

user3067860
  • 456
  • 4
  • 11