| Chunk |
|---|
| Conflicting content |
|---|
try {
SystemReader.getInstance().checkPath(path);
} catch (CorruptObjectException e) {
<<<<<<< HEAD
throw new InvalidPathException(path);
=======
InvalidPathException p = new InvalidPathException(path);
p.initCause(e);
throw p;
>>>>>>> 8899006c09058934074100ea8921b3175100412e
}
}
|
| Solution content |
|---|
try {
SystemReader.getInstance().checkPath(path);
} catch (CorruptObjectException e) {
InvalidPathException p = new InvalidPathException(path);
p.initCause(e);
throw p;
}
}
|
| File |
|---|
| DirCacheCheckout.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Throw statement |
| Variable |