Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » Merge tool(Can't get the merge tool to function)
Merge tool [message #728413] Fri, 23 September 2011 08:49 Go to next message
Ben  is currently offline Ben
Messages: 4
Registered: September 2011
Junior Member
I have Flash Builder 4.5 (CS 5.5 Premium) which is basically eclipse with some adobe add-ons. I'm using it on a windows PC (tried it on 2 pcs actually) and I can't get EGit's merge tool to work. The merge tool option shows under 'team' in the context menu but it is always muted. Currently if there are merge conflicts, it throws an error and doesn't complete the merge.

I've seen a video on youtube of someone using Flash Builder and it's working fine.

Do I need to download a special merge tool and configure it to work in eclipse/flash builder?

I know there are some other merge tools out there, but being able to do everything in eclipse would be great and setting up the other tools can be confusing and time-consuming.

PS. I'm running the latest stable release of git for windows and I have Egit 1.0.0.201106090707-r

[Updated on: Fri, 23 September 2011 08:51]

Report message to a moderator

Re: Merge tool [message #728509 is a reply to message #728413] Fri, 23 September 2011 11:45 Go to previous messageGo to next message
Manuel Doninger is currently offline Manuel Doninger
Messages: 119
Registered: October 2010
Senior Member
Can you try the latest release (1.1)? AFAIR the 1.0 release had a few bugs.
Re: Merge tool [message #728840 is a reply to message #728413] Sat, 24 September 2011 02:50 Go to previous messageGo to next message
Ben  is currently offline Ben
Messages: 4
Registered: September 2011
Junior Member
It appears I have 1.1 after all. I did just update it the other day. I'll check the merge tool again.

[Updated on: Sat, 24 September 2011 03:04]

Report message to a moderator

Re: Merge tool [message #728847 is a reply to message #728840] Sat, 24 September 2011 03:39 Go to previous messageGo to next message
Ben  is currently offline Ben
Messages: 4
Registered: September 2011
Junior Member
Still nothing. It's always grayed out.
Re: Merge tool [message #728885 is a reply to message #728847] Sat, 24 September 2011 07:46 Go to previous messageGo to next message
Manuel Doninger is currently offline Manuel Doninger
Messages: 119
Registered: October 2010
Senior Member
The Merge Tool is only available, if you have merge conflicts (otherwise there would be nothing to merge). Do the merge still throw an error and aborts the merge, if you have conflicts or does this work now?
Re: Merge tool [message #728889 is a reply to message #728413] Sat, 24 September 2011 08:21 Go to previous messageGo to next message
Matthias Sohn is currently offline Matthias Sohn
Messages: 578
Registered: July 2009
Senior Member
What's the error shown ? Any stack trace you could post ?
Re: Merge tool [message #728904 is a reply to message #728885] Sat, 24 September 2011 10:02 Go to previous messageGo to next message
Ben  is currently offline Ben
Messages: 4
Registered: September 2011
Junior Member
This is the error I get on a pull. I still get the error in 1.1 and the merge tool is still grayed out. I've tried going to the synchronize view and it is still grayed out.

Exception caught during execution of merge command. org.eclipse.jgit.errors.CheckoutConflictException: Checkout conflict with files:
BPLab/.actionScriptProperties
Re: Merge tool [message #728939 is a reply to message #728904] Sat, 24 September 2011 13:13 Go to previous message
Manuel Doninger is currently offline Manuel Doninger
Messages: 119
Registered: October 2010
Senior Member
Then you have uncommitted changes in a file, which would be changed by the checkout made by the merge. You have to commit these changes first (or change to commandline Git and use stash).
Previous Topic:I must work with submodules - How can I change branches?
Next Topic:History view: Show Notes History
Goto Forum:
  


Current Time: Wed Sep 17 15:57:04 GMT 2014

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

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