Eclipse Community Forums: EGit / JGit » Saving in merge tool causes endless blocking

Search

Help

Login

Home » Eclipse Projects » EGit / JGit » Saving in merge tool causes endless blocking

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

Switch to threaded view of this topic

Create a new topic

Submit Reply

Saving in merge tool causes endless blocking [message #1563536]

Wed, 14 January 2015 08:54

Ulrich Wielant is currently offline

Friend

Messages: 14
Registered: January 2015

Junior Member

When I try to solve a merge conflict I open the merge tool with a right click on the file in the staging view. After saving the file in the merge tool the progress information dialog pops up containing the message "The user operation is waiting for background work to complete".
It is not possible to cancel this message or to close the dialog and it does not disappear. The only solution is to kill Eclipse using the taskmanager.

I am running Eclipse Luna (4.4.1) and EGit 3.6.1.201501031845-r.

Report message to a moderator

Re: Saving in merge tool causes endless blocking [message #1564080 is a reply to message #1563536]

Wed, 14 January 2015 15:40

Matthias Sohn is currently offline

Friend

Messages: 1268
Registered: July 2009

Senior Member

This is a regression introduced in 3.6.1 [1] which was fixed for 3.6.2 [2] which we plan to tag soon.

[1] https://bugs.eclipse.org/bugs/show_bug.cgi?id=456758
[2] https://git.eclipse.org/r/#/c/39101/

Report message to a moderator

Re: Saving in merge tool causes endless blocking [message #1576287 is a reply to message #1564080]

Wed, 21 January 2015 08:08

Ulrich Wielant is currently offline

Friend

Messages: 14
Registered: January 2015

Junior Member

Thanks! I can confirm that the problem is fixed in the stable nightly build (3.6.2.201501071038).

Report message to a moderator

Re: Saving in merge tool causes endless blocking [message #1579281 is a reply to message #1576287]

Thu, 22 January 2015 22:37

Matthias Sohn is currently offline

Friend

Messages: 1268
Registered: July 2009

Senior Member

3.6.2 is now available from the EGit update site http://download.eclipse.org/egit/updates

Report message to a moderator

Switch to threaded view of this topic

Create a new topic

Submit Reply

Previous Topic:	How to upgrade EGit ?
Next Topic:	EGit removing stale branches?

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Fri Apr 19 19:26:11 GMT 2024

Powered by FUDForum. Page generated in 0.04615 seconds

.:: Contact :: Home ::.

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

Back to the top