void (@NotNull List<? extends VirtualFile> files, @NotNull Resolution resolution) { MultiMap<VirtualFile, GitConflict> byRoot = groupConflictsByRoot(files); for (VirtualFile root : byRoot.keySet()) { Collection<GitConflict> conflicts = byRoot.get(root); ConflictSide resolutionSide = resolution != Resolution.Merged ? getAcceptedConflictSide(resolution, root) : null; try { markConflictResolved(myProject, root, conflicts, resolutionSide); } catch (VcsException e) { LOG.error(String.format("Unexpected exception during the git operation. Files - %s", ContainerUtil.map(conflicts, GitConflict::getFilePath)), e); } } }