| Chunk |
|---|
| Conflicting content |
|---|
int currentLogSet = logSetId.get();
int seq = -1;
<<<<<<< HEAD
int attempt = 0;
=======
int attempt = 1;
>>>>>>> ec3a160425a8c307e5b4dbe859d29f45377c680c
boolean success = false;
while (!success) {
try { |
| Solution content |
|---|
int currentLogSet = logSetId.get();
int seq = -1;
int attempt = 1;
boolean success = false;
while (!success) {
try { |
| File |
|---|
| TabletServerLogger.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Variable |