"Merge Tool" greyed out [message #991916] |
Thu, 20 December 2012 08:32  |
Eclipse User |
|
|
|
Hi,
I am trying to merge a branch into the master. Two files have conflicts. Now I'd like to resolve the conflicts using the merge tool, as shown in the User Guide, but the "Merge Tool" menu entry is greyed out, everywhere in Eclipse. Help me, please?
|
|
|
Re: "Merge Tool" greyed out [message #993251 is a reply to message #991916] |
Sun, 23 December 2012 17:00  |
Eclipse User |
|
|
|
I never experienced this myself, but other people seem to also have problems sometimes, see the question "Why is the merge tool disabled in Eclipse for a EGit-managed project?" on Stack Overflow (sorry, can't link).
Also see EGit bug 376135, for which a possible solution is in review.
|
|
|
Powered by
FUDForum. Page generated in 0.03027 seconds