Eclipse Community Forums: EGit / JGit » "Merge Tool" greyed out

Help

Home

Home » Eclipse Projects » EGit / JGit » "Merge Tool" greyed out

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

"Merge Tool" greyed out [message #991916]

Thu, 20 December 2012 13:32

Amelie Mentor

Messages: 2
Registered: December 2012

Junior Member

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?

Report message to a moderator

Re: "Merge Tool" greyed out [message #993251 is a reply to message #991916]

Sun, 23 December 2012 22:00

Robin Stocker

Messages: 6
Registered: July 2009

Junior Member

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.

Report message to a moderator

Previous Topic:	2.3.0 missing project-set support?
Next Topic:	Is it possible to reutilize git repository of tortoisegit within Egit

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Tue Aug 03 05:34:35 GMT 2021

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter