MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

vcs: disable changelist conflict dialog for vcs that support partial changelists

Browse Source
This commit is contained in:
Aleksey Pivovarov
2018-02-05 18:56:44 +03:00
parent 1a5fc0e64c
commit 1f286ca176
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictTracker.java
+1
View File
@@ -173,6 +173,7 @@ public class ChangelistConflictTracker {
}
public boolean isWritingAllowed(@NotNull VirtualFile file) {
if (!shouldDetectConflictsFor(file)) return true;
if (isFromActiveChangelist(file)) return true;
Conflict conflict = myConflicts.get(file.getPath());
return conflict != null && conflict.ignored;