| Chunk |
|---|
| Conflicting content |
|---|
for (PropertyDeclaration prop : sourceDecl.getDeclaredProperties()) {
PropertyDeclaration declared = model.findPropertyDeclaration(prop.getName().identifier);
if (declared != null) {
<<<<<<< HEAD
LOG.debug("property {} is duplicated", prop.getSymbol());
results.put(declared.getName().identifier, declared);
=======
LOG.debug("property {} is duplicated", prop.getSymbol()); //$NON-NLS-1$
>>>>>>> c5a209e956ce03aaab744bb3a4d546e62587093f
} else {
declared = model.declareProperty(
sourceModel.getName(), |
| Solution content |
|---|
for (PropertyDeclaration prop : sourceDecl.getDeclaredProperties()) {
PropertyDeclaration declared = model.findPropertyDeclaration(prop.getName().identifier);
if (declared != null) {
LOG.debug("property {} is duplicated", prop.getSymbol()); //$NON-NLS-1$
results.put(declared.getName().identifier, declared);
} else {
declared = model.declareProperty(
sourceModel.getName(), |
| File |
|---|
| DmdlAnalyzer.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
}
PropertyDeclaration declared = model.findPropertyDeclaration(property.target.identifier);
if (declared != null) {
<<<<<<< HEAD
LOG.debug("property {} is duplicated", property.target);
results.put(declared.getName().identifier, declared);
=======
LOG.debug("property {} is duplicated", property.target); //$NON-NLS-1$
>>>>>>> c5a209e956ce03aaab744bb3a4d546e62587093f
} else {
declared = model.declareProperty(
property, |
| Solution content |
|---|
}
PropertyDeclaration declared = model.findPropertyDeclaration(property.target.identifier);
if (declared != null) {
LOG.debug("property {} is duplicated", property.target); //$NON-NLS-1$
results.put(declared.getName().identifier, declared);
} else {
declared = model.declareProperty(
property, |
| File |
|---|
| DmdlAnalyzer.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Comment |
| Method invocation |