| Chunk |
|---|
| Conflicting content |
|---|
gp_task.execute();
break;
case R.id.post_button:
<<<<<<< HEAD
startActivity(new Intent(this, PostQuestionActivity.class));
=======
showAlert("post", "post_button is clicked");
>>>>>>> c8f8538db4cb7248edf6a9cb762ba4dd18aeb4a0
break;
default:
break; |
| Solution content |
|---|
gp_task.execute();
break;
case R.id.post_button:
startActivity(new Intent(this, PostQuestionActivity.class));
break;
default:
break; |
| File |
|---|
| HQTPActivity.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |