Skip to content

Issue557 merge conflict ui deadlock

Bitbucket Importer requested to merge bitbucket/merged-pr-68 into branch/default

Created originally on Bitbucket by colin-hurley (Colin Hurley)

Was already merged in Bitbucket before import, marked as merged by the import user

  • Fix SWT exception when instantiating the AutoresolveRecapDialog after a rebase conflict occurs

  • Fixes #557 (closed) Eclipse hangs when pulling/rebasing

    The AutoresolveRecapDialog is now modal to prevent UI deadlocks. The deadlocks occur because wizards and other modal dialogs are opened (or are already open) during the operation that opens the AutoresolveRecapDialog. The wizard/dialog is unable to close because it is waiting for the AutoresolveRecapDialog to close (this happens down in the SWT UI event loop). Meanwhile the AutoresolveRecapDialog will not accept user input until the wizard/dialog is closed, so the user is unable to close either dialog.

    Changing the AutoresolveRecapDialog to be modal avoids the deadlock by making it possible for the user to interact with that dialog while the other wizard/dialog is still open. After closing the AutoresolveRecapDialog, the other wizard/dialog will then also be able to close.

Merge request reports