| Chunk |
|---|
| Conflicting content |
|---|
import org.ohmage.request.document.DocumentReadRequest; import org.ohmage.request.document.DocumentUpdateRequest; import org.ohmage.request.image.ImageReadRequest; <<<<<<< HEAD import org.ohmage.request.image.ImageUploadRequest; import org.ohmage.request.mobility.MobilityReadChunkedRequest; import org.ohmage.request.mobility.MobilityReadRequest; ======= >>>>>>> 44ef9179bdfe0a50064e108eb55e04d32bea1385 import org.ohmage.request.mobility.MobilityUploadRequest; import org.ohmage.request.survey.SurveyUploadRequest; import org.ohmage.request.survey.SurveyResponseDeleteRequest; |
| Solution content |
|---|
import org.ohmage.request.document.DocumentReadRequest; import org.ohmage.request.document.DocumentUpdateRequest; import org.ohmage.request.image.ImageReadRequest; import org.ohmage.request.mobility.MobilityReadChunkedRequest; import org.ohmage.request.mobility.MobilityReadRequest; import org.ohmage.request.mobility.MobilityUploadRequest; import org.ohmage.request.survey.SurveyResponseDeleteRequest; |
| File |
|---|
| RequestBuilder.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
else if(API_MOBILITY_UPLOAD.equals(requestUri)) {
return new MobilityUploadRequest(httpRequest);
}
<<<<<<< HEAD
else if(API_MOBILITY_READ.equals(requestUri)) {
return new MobilityReadRequest(httpRequest);
}
else if(API_MOBILITY_READ_CHUNKED.equals(requestUri)) {
return new MobilityReadChunkedRequest(httpRequest);
}
//Survey
=======
>>>>>>> 44ef9179bdfe0a50064e108eb55e04d32bea1385
else if(API_SURVEY_UPLOAD.equals(requestUri)) {
return new SurveyUploadRequest(httpRequest);
} |
| Solution content |
|---|
else if(API_MOBILITY_UPLOAD.equals(requestUri)) {
return new MobilityUploadRequest(httpRequest);
}
else if(API_MOBILITY_READ.equals(requestUri)) {
return new MobilityReadRequest(httpRequest);
}
else if(API_MOBILITY_READ_CHUNKED.equals(requestUri)) {
return new MobilityReadChunkedRequest(httpRequest);
}
//Survey
else if(API_SURVEY_UPLOAD.equals(requestUri)) {
return new SurveyUploadRequest(httpRequest);
} |
| File |
|---|
| RequestBuilder.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Method invocation |
| Return statement |