void (@NotNull VirtualFile file) { // TODO: Add possibility to resolve content conflicts separately from property conflicts. SvnVcs vcs = SvnVcs.getInstance(myProject); File path = virtualToIoFile(file); try { // TODO: Probably false should be passed to "resolveTree", but previous logic used true implicitly vcs.getFactory(path).createConflictClient().resolve(path, Depth.EMPTY, false, true, true); } catch (VcsException e) { LOG.warn(e); } // the .mine/.r## files have been deleted final VirtualFile parent = file.getParent(); if (parent != null) { parent.refresh(true, false); } }