Changeset 1699 in josm for trunk

Timestamp:

2009-06-27T01:52:57+02:00 (15 years ago)

Author:

Gubaer

Message:

updated merge rules. deleted state of my version has precedence over their version.

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java

@@ -241 +241 @@
                     my.cloneFrom(other);
                     merged.put(other, my);
+                } else if (my.deleted && ! other.deleted && my.version == other.version) {
+                    // same version, but my is deleted. Assume mine takes precedence
+                    // otherwise too many conflicts when refreshing from the server
+                    merged.put(other, my);
                 } else if (my.deleted != other.deleted) {
                     // differences in deleted state have to be resolved manually