ObjectId theirs = toMergeDiff.getNewObject() == null ? ObjectId.NULL : toMergeDiff
.getNewObject().objectId();
DiffEntry mergeIntoDiff = mergeIntoDiffs.get(path);
ObjectId ours = mergeIntoDiff.getNewObject() == null ? ObjectId.NULL
: mergeIntoDiff.getNewObject().objectId();
if (!mergeIntoDiff.changeType().equals(toMergeDiff.changeType())) {
report.addConflict(new Conflict(path, ancestorVersionId, ours, theirs));
continue;
}
switch (toMergeDiff.changeType()) {
case ADDED: