void (@NotNull VirtualFile file, boolean ignore) { String path = file.getPath(); Conflict conflict = myConflicts.get(path); if (conflict == null) { conflict = new Conflict(); myConflicts.put(path, conflict); } conflict.ignored = ignore; FileStatusManager.getInstance(myProject).fileStatusChanged(file); EditorNotifications.getInstance(myProject).updateNotifications(file); }