boolean () { LOG.info("isMergeInProgress: checking if there is an unfinished merge process..."); final Collection<VirtualFile> mergingRoots = myMerger.getMergingRoots(); if (mergingRoots.isEmpty()) { return false; } LOG.info("isMergeInProgress: roots with unfinished merge: " + mergingRoots); GitConflictResolver.Params params = new GitConflictResolver.Params(myProject); params.setErrorNotificationTitle(GitBundle.message("update.process.generic.error.title")); params.setMergeDescription(GitBundle.message("update.process.error.message.unfinished.merge")); return !new GitMergeCommittingConflictResolver(myProject, myGit, myMerger, mergingRoots, params, false).merge(); }