| Chunk |
|---|
| Conflicting content |
|---|
// Mark lineages ancestral to nodes with matching reactionGroup
for (Node node : leafNodes) {
<<<<<<< HEAD
switch (rule) {
case BY_POPTYPENAME:
if (node.getPopulation().getType().getName().equals(name))
mark(node, reverseTime);
break;
case BY_POPTYPENAME_INV:
if (!node.getPopulation().getType().getName().equals(name))
mark(node, reverseTime);
break;
case BY_REACTNAME:
if (node.getReactionGroup().getName().equals(name))
mark(node, reverseTime);
break;
case BY_REACTNAME_INV:
if (!node.getReactionGroup().getName().equals(name))
mark(node, reverseTime);
break;
}
=======
InheritanceReactionGroup leafRG = node.getReactionGroup();
if (leafRG != null && leafRG.getName().equals(reactionGroupName))
mark(node, reverseTime);
>>>>>>> 27eafebfdcd2b77bb347ffcd31a2c8d5d8fddf36
}
// Explicitly unmark lineages decending from unmarked root nodes |
| Solution content |
|---|
// Mark lineages ancestral to nodes with matching reactionGroup
for (Node node : leafNodes) {
switch (rule) {
case BY_POPTYPENAME:
if (node.getPopulation() != null && node.getPopulation().getType().getName().equals(name))
mark(node, reverseTime);
break;
case BY_POPTYPENAME_INV:
if (!(node.getPopulation() != null && node.getPopulation().getType().getName().equals(name)))
mark(node, reverseTime);
break;
case BY_REACTNAME:
if (node.getReactionGroup() != null && node.getReactionGroup().getName().equals(name))
mark(node, reverseTime);
break;
case BY_REACTNAME_INV:
if (!(node.getReactionGroup() != null && node.getReactionGroup().getName().equals(name)))
mark(node, reverseTime);
break;
}
}
// Explicitly unmark lineages decending from unmarked root nodes |
| File |
|---|
| FilterLineages.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Switch statement |
| Variable |