Changeset 9440 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/IConflictResolver.java

Timestamp:

2016-01-14T16:42:50+01:00 (8 years ago)

Author:

simon04

Message:

see #12338 - Conflict resolution: add expert actions "Resolve to my/their versions" in popup menu

This resolves all selected conflicts to my/their versions.

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/IConflictResolver.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/IConflictResolver.java

@@ -10 +10 @@
 
     void populate(Conflict<? extends OsmPrimitive> conflict);
+
+    void decideRemaining(MergeDecisionType decision);
 }