| Chunk |
|---|
| Conflicting content |
|---|
String upFileName = "Uploaded";
MultipartFile upFile = new MockMultipartFile("Uploaded.py", "#test content...".getBytes());
<<<<<<< HEAD
scriptController.uploadFiles(getTestUser(), path, "upload", upFile, model);
=======
path = path + "/" + upFileName;
scriptController.uploadFiles(getTestUser(), path, "hello", upFile, model);
>>>>>>> 7bf972270e20185f99d6fe673f971a5efc86657e
model.clear();
scriptController.searchFileEntity(getTestUser(), "Uploaded", model); |
| Solution content |
|---|
String upFileName = "Uploaded";
MultipartFile upFile = new MockMultipartFile("Uploaded.py", "#test content...".getBytes());
path = path + "/" + upFileName;
scriptController.uploadFiles(getTestUser(), path, "hello", upFile, model);
model.clear();
scriptController.searchFileEntity(getTestUser(), "Uploaded", model); |
| File |
|---|
| FileEntryControllerTest.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |