Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » "Merge Tool" greyed out
"Merge Tool" greyed out [message #991916] Thu, 20 December 2012 13:32 Go to next message
Amelie Mentor is currently offline Amelie MentorFriend
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?
Re: "Merge Tool" greyed out [message #993251 is a reply to message #991916] Sun, 23 December 2012 22:00 Go to previous message
Robin Stocker is currently offline Robin StockerFriend
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.
Previous Topic:2.3.0 missing project-set support?
Next Topic:Is it possible to reutilize git repository of tortoisegit within Egit
Goto Forum:
  


Current Time: Wed Nov 26 10:34:28 GMT 2014

Powered by FUDForum. Page generated in 0.02965 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software