001// License: GPL. For details, see LICENSE file. 002package org.openstreetmap.josm.gui.conflict.pair; 003 004import org.openstreetmap.josm.data.conflict.Conflict; 005import org.openstreetmap.josm.data.osm.OsmPrimitive; 006 007public interface IConflictResolver { 008 009 void deletePrimitive(boolean deleted); 010 011 void populate(Conflict<? extends OsmPrimitive> conflict); 012 013 void decideRemaining(MergeDecisionType decision); 014}