IProgressMonitor monitor) throws CoreException {
IDiff[] deltas = getSetToMerge(mergeContext);
IStatus status = mergeContext.merge(deltas, false /* don't force */,
monitor);
if (status.getCode() == IMergeStatus.CONFLICTS) {
return new MergeStatus(status.getPlugin(), status.getMessage(),
mergeContext.getScope().getMappings(providerID));
}
return status;
}