ResolveConflictResult (@NotNull GitRepository conflicting, boolean calledFromNotification) { GitConflictResolver.Params params = new GitConflictResolver .Params(myProject) .setMergeDialogCustomizer(createRebaseDialogCustomizer(conflicting, myRebaseSpec)) .setReverse(true); RebaseConflictResolver conflictResolver = new RebaseConflictResolver(myProject, conflicting, params, calledFromNotification); boolean allResolved = conflictResolver.merge(); if (conflictResolver.myWasNothingToMerge) return ResolveConflictResult.NOTHING_TO_MERGE; if (allResolved) return ResolveConflictResult.ALL_RESOLVED; return ResolveConflictResult.UNRESOLVED_REMAIN; }