boolean (@NotNull VirtualFile file) { if (!shouldDetectConflicts()) { return false; } String path = file.getPath(); Conflict conflict = myConflicts.get(path); if (conflict == null || conflict.ignored) { return false; } if (!shouldDetectConflictsFor(file) || isFromActiveChangelist(file)) { myConflicts.remove(path); return false; } return true; }