| Chunk |
|---|
| Conflicting content |
|---|
// change1234
public class Staged {
<<<<<<< HEAD
// test23
=======
//adskjh
>>>>>>> 58dece64ecf5c7faef84cf07472a637497b5ddc3
} |
| Solution content |
|---|
// change1234
public class Staged {
// test23
} |
| File |
|---|
| Staged.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |