| Chunk |
|---|
| Conflicting content |
|---|
if(fieldname.endsWith("Start")){
fieldid = fieldname.substring(0, (fieldname.length() - 5));
join = ">= TIMESTAMP ";
<<<<<<< HEAD
value = beginningOfDay(value);
=======
>>>>>>> 7c84a04d8718447214ab927ec2135588c9f32901
}
else if(fieldname.endsWith("End")){
fieldid = fieldname.substring(0, (fieldname.length() - 3)); |
| Solution content |
|---|
if(fieldname.endsWith("Start")){
fieldid = fieldname.substring(0, (fieldname.length() - 5));
join = ">= TIMESTAMP ";
}
else if(fieldname.endsWith("End")){
fieldid = fieldname.substring(0, (fieldname.length() - 3)); |
| File |
|---|
| GenericSearch.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
else if(fieldname.endsWith("End")){
fieldid = fieldname.substring(0, (fieldname.length() - 3));
join = "<= TIMESTAMP ";
<<<<<<< HEAD
value = endOfDay(value);
=======
timestampAffix = "T23:59:59.999Z";
>>>>>>> 7c84a04d8718447214ab927ec2135588c9f32901
}
value += timestampAffix;
|
| Solution content |
|---|
else if(fieldname.endsWith("End")){
fieldid = fieldname.substring(0, (fieldname.length() - 3));
join = "<= TIMESTAMP ";
timestampAffix = "T23:59:59.999Z";
}
value += timestampAffix;
|
| File |
|---|
| GenericSearch.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |