void (@NotNull GitRepository currentRepository, @NotNull Notification notification) { ResolveConflictResult result = showConflictResolver(currentRepository, true); if (result == ResolveConflictResult.NOTHING_TO_MERGE) { ApplicationManager.getApplication().invokeLater(() -> { boolean continueRebase = MessageDialogBuilder.yesNo(GitBundle.message("rebase.notification.all.conflicts.resolved.title"), GitBundle.message("rebase.notification.all.conflicts.resolved.text")) .yesText(GitBundle.message("rebase.notification.all.conflicts.resolved.continue.rebase.action.text")) .noText(CommonBundle.getCancelButtonText()) .ask(myProject); if (continueRebase) { retry(GitBundle.message("rebase.progress.indicator.continue.title")); notification.expire(); } }); } }