void (@NotNull GitRepository conflictingRepository) { String description = GitRebaseUtils.mentionLocalChangesRemainingInStash(mySaver); Notification notification = IMPORTANT_ERROR_NOTIFICATION .createNotification(GitBundle.message("rebase.notification.conflict.title"), description, NotificationType.WARNING) .setDisplayId(GitNotificationIdsHolder.REBASE_STOPPED_ON_CONFLICTS) .addAction(createResolveNotificationAction(conflictingRepository)) .addAction(CONTINUE_ACTION) .addAction(ABORT_ACTION); if (mySaver.wereChangesSaved()) notification.addAction(VIEW_STASH_ACTION); myNotifier.notify(notification); }