boolean (@NotNull GitConflict conflict) { VirtualFile file = conflict.getFilePath().getVirtualFile(); if (file == null) return false; if (file.isDirectory()) return false; // Can't handle conflicts in submodules return conflict.getStatus(ConflictSide.OURS) != Status.DELETED || conflict.getStatus(ConflictSide.THEIRS) != Status.DELETED; }