void (@NotNull MergeResult result) { if (result != MergeResult.CANCEL) { try { GitMergeUtil.markConflictResolved(myProject, myConflict.getRoot(), singletonList(myConflict), getResolutionSide(result)); } catch (VcsException e) { LOG.error(String.format("Unexpected exception during the git operation: file - %s)", myConflict.getFilePath()), e); } } VcsDirtyScopeManager.getInstance(myProject).fileDirty(myFile); }