| Chunk |
|---|
| Conflicting content |
|---|
"-o", fullOutPath };
try {
compressor.compress(args);
<<<<<<< HEAD
ConsoleUtils.info("Compress successed: " + fullOutPath);
=======
ConsoleUtils.info("Compress successed: "
+ fullOutPath);
>>>>>>> e60174b944fad40e1685ec2028dc4062a0b1e4e2
} catch (Exception e) {
ConsoleUtils.error("Compress failed: "
+ fullOutPath, e); |
| Solution content |
|---|
"-o", fullOutPath };
try {
compressor.compress(args);
ConsoleUtils.info("Compress successed: "
+ fullOutPath);
} catch (Exception e) {
ConsoleUtils.error("Compress failed: "
+ fullOutPath, e); |
| File |
|---|
| FolderCompressorAction.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |