Changeset 15295 in josm for trunk/src/org

Timestamp:

2019-08-11T21:53:01+02:00 (5 years ago)

Author:

Upliner

Message:

Avoid adding multiple conflicts for single object, fixes #17875

File:

• trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

@@ -291 +291 @@
     public void add(ConflictCollection other) {
         for (Conflict<?> c : other) {
-            add(c);
+            if (!hasConflict(c)) {
+                add(c);
+            }
         }
     }