Changeset 1699 in josm


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java

    r1694 r1699  
    241241                    my.cloneFrom(other);
    242242                    merged.put(other, my);
     243                } else if (my.deleted && ! other.deleted && my.version == other.version) {
     244                    // same version, but my is deleted. Assume mine takes precedence
     245                    // otherwise too many conflicts when refreshing from the server
     246                    merged.put(other, my);
    243247                } else if (my.deleted != other.deleted) {
    244248                    // differences in deleted state have to be resolved manually
Note: See TracChangeset for help on using the changeset viewer.