Skip to main content


Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit / JGit » Merge Tool showing a blank window
Merge Tool showing a blank window [message #1810346] Thu, 08 August 2019 15:02 Go to next message
Sergio Mendez is currently offline Sergio MendezFriend
Messages: 3
Registered: April 2014
Junior Member
I am using Eclipse Version: 2019-06 (4.12.0) with the Git integration (5.4.0)

I am intentionally created a conflict in a local branch during a Pull, so I could test out the merging functionality. I see my file is marked with the red diamond indicating that has a conflict that needs to be merged. I right-click on the file and select to use the Merge Tool (with the option to use HEAD during the Merge Mode selection).

It brings up a window within Eclipse (which I am assuming is the merge tool), but the window is completely blank.

Is this a known issue? Do I need to configure anything to get this to work?

Any help is greatly appreciated.

Sergio

P.S.

Here is a picture showing what this looks like:

index.php/fa/36070/0/
  • Attachment: Capture.PNG
    (Size: 8.46KB, Downloaded 121 times)
Re: Merge Tool showing a blank window [message #1811078 is a reply to message #1810346] Mon, 26 August 2019 14:37 Go to previous message
Matthias Sohn is currently offline Matthias SohnFriend
Messages: 1105
Registered: July 2009
Senior Member
please file a bug and add details
Previous Topic:Can't import Git Projects
Next Topic:JGit DFS
Goto Forum:
  


Current Time: Wed Dec 11 11:29:20 GMT 2019

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

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

Back to the top