From 1f286ca176a961cce402313d788fc084d949d978 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Mon, 5 Feb 2018 17:50:27 +0300
Subject: [PATCH] vcs: disable changelist conflict dialog for vcs that support
 partial changelists

---
 .../openapi/vcs/changes/conflicts/ChangelistConflictTracker.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictTracker.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictTracker.java
index b4099fdeb6ac..6ec2e911caca 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictTracker.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictTracker.java
@@ -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;