| Chunk |
|---|
| Conflicting content |
|---|
// append child to new parent
treeManager.appendChild(this, (DOMNode)currentChild);
<<<<<<< HEAD
DOMNode domNode = (DOMNode) node;
Node parent = domNode.getParentNode();
if (parent != null && parent instanceof DOMNode) {
treeManager.removeChild((DOMNode) parent, domNode);
}
treeManager.appendChild(this, (DOMNode)node);
=======
// next
currentChild = savedNextChild;
}
} else {
treeManager.appendChild(this, (DOMNode)newChild);
}
>>>>>>> 0082fd036bac37e8a9c03095c9955e03a98db735
} catch (FrameworkException fex) {
|
| Solution content |
|---|
// append child to new parent
treeManager.appendChild(this, (DOMNode)currentChild);
// next
currentChild = savedNextChild;
}
} else {
Node parent = newChild.getParentNode();
if (parent != null && parent instanceof DOMNode) {
treeManager.removeChild((DOMNode) parent, (DOMNode) newChild);
}
treeManager.appendChild(this, (DOMNode)newChild);
}
} catch (FrameworkException fex) {
|
| File |
|---|
| DOMNode.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Cast expression |
| Comment |
| If statement |
| Method invocation |
| Variable |