public class MyTracedConnector extends SVNKitConnector { public MyTracedConnector() { super(); setConflictResolver(new ISVNConflictResolutionCallback() { @Override public SVNConflictResolution resolve( SVNConflictDescriptor descriptor) throws SVNConnectorException { // if EMF model file, try to resolve the conflict if (isMyFileType(descriptor.localPath)) { // TODO: try to resolve the conflict return new SVNConflictResolution(SVNConflictResolution.POSTPONE, descriptor.localPath); // else, do nothing more --> not resolved } else { return new SVNConflictResolution(SVNConflictResolution.POSTPONE, descriptor.mergedPath); } } }); } ...