| Chunk |
|---|
| Conflicting content |
|---|
Entity referencedBy = EntityIntegrityChecker.
referencedBy(entityType, entityObj);
if (referencedBy != null) {
<<<<<<< HEAD
throw new IvoryException(entityObj.getName() + " (" + entityType + ") cant " +
=======
throw new IvoryException(entityObj.getName() + "(" + entityType + ") cant " +
>>>>>>> b9faacfec13903ab91ee008125f649819928ca65
"be removed as it is referred by " + referencedBy.getName() +
" (" + referencedBy.getEntityType() + ")");
} |
| Solution content |
|---|
Entity referencedBy = EntityIntegrityChecker.
referencedBy(entityType, entityObj);
if (referencedBy != null) {
throw new IvoryException(entityObj.getName() + "(" + entityType + ") cant " +
"be removed as it is referred by " + referencedBy.getName() +
" (" + referencedBy.getEntityType() + ")");
} |
| File |
|---|
| EntityManager.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Throw statement |