| Chunk |
|---|
| Conflicting content |
|---|
if (!groupTag.equals(name)) {
tag.add(groupTag);
}
<<<<<<< HEAD
if (t != null) {
tag.add(t.getRemoteAddress().getHostName());
}
=======
tag.add(t.getRemoteAddress().getHostString());
>>>>>>> 1338a579591d8ec123bd6040cf3589965289db33
tag.add("web");
root = new RootFolder(tag);
try { |
| Solution content |
|---|
if (!groupTag.equals(name)) {
tag.add(groupTag);
}
tag.add(t.getRemoteAddress().getHostName());
tag.add("web");
root = new RootFolder(tag);
try { |
| File |
|---|
| RemoteWeb.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| If statement |