Skip to main content


Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit / JGit » How to use Merge Tool
How to use Merge Tool [message #657547] Thu, 03 March 2011 09:09 Go to next message
Sunny  is currently offline Sunny Friend
Messages: 3
Registered: March 2011
Junior Member
When I Cherry-pick one commit to current commit, there is a file conflicted, and I refer to http://wiki.eclipse.org/EGit/User_Guide#Resolving_a_merge_co nflict. But when click Team >> Merge Tool, "Merge Tool" is disable. Why? Did I do something wrong?
Re: How to use Merge Tool [message #658249 is a reply to message #657547] Mon, 07 March 2011 15:13 Go to previous message
Stefan Lay is currently offline Stefan LayFriend
Messages: 342
Registered: July 2009
Senior Member
Hi Sunny,

you hit a so-far unknown bug in EGit. The Merge tool should be enabled in
case of a conflict after cherry pick but it isn't. I opened a bug for this:
https://bugs.eclipse.org/bugs/show_bug.cgi?id=339092

Until the bug is fixed you can just edit the file in the editor and then add
the conflict resolution with Team -> Add. When you commit afterwards, there
is still another bug (https://bugs.eclipse.org/bugs/show_bug.cgi?id=339096):
the commit message is empty. You have to copy it from the cherry-picked
commit, or you can use the command line git commit -c <name of the
cherry-picked commit>.

Stefan

"Sunny" <ygyy258@yahoo.com.cn> wrote in message
news:iknlfd$rj9$1@news.eclipse.org...
> When I Cherry-pick one commit to current commit, there is a file
> conflicted, and I refer to
> http://wiki.eclipse.org/EGit/User_Guide#Resolving_a_merge_co nflict But
> when click Team >> Merge Tool, "Merge Tool" is disable. Why? Did I do
> something wrong?
Previous Topic:Internal error GitDecoratorJob NullPointerException
Next Topic:Can EGit support projectSet.psf?
Goto Forum:
  


Current Time: Sun Mar 29 23:02:16 GMT 2020

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

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

Back to the top