| Chunk |
|---|
| Conflicting content |
|---|
parser.accepts("backup-incremental",
"Perform an incremental backup for point-in-time recovery."
+ " By default backup has latest consistent snapshot.");
<<<<<<< HEAD
parser.accepts("zone", "zone id")
.withRequiredArg()
.describedAs("zone-id")
.ofType(Integer.class);
=======
parser.accepts("rollback", "rollback a store")
.withRequiredArg()
.describedAs("store-name")
.ofType(String.class);
parser.accepts("version", "Push version of store to rollback to")
.withRequiredArg()
.describedAs("version")
.ofType(Long.class);
>>>>>>> 24dbf6165a7bf777edbfe76fe1a3ed51bac02ddc
OptionSet options = parser.parse(args);
|
| Solution content |
|---|
parser.accepts("backup-incremental",
"Perform an incremental backup for point-in-time recovery."
+ " By default backup has latest consistent snapshot.");
parser.accepts("zone", "zone id")
.withRequiredArg()
.describedAs("zone-id")
.ofType(Integer.class);
parser.accepts("rollback", "rollback a store")
.withRequiredArg()
.describedAs("store-name")
.ofType(String.class);
parser.accepts("version", "Push version of store to rollback to")
.withRequiredArg()
.describedAs("version")
.ofType(Long.class);
OptionSet options = parser.parse(args); |
| File |
|---|
| VoldemortAdminTool.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Method invocation |