| Chunk |
|---|
| Conflicting content |
|---|
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
<<<<<<< HEAD:src/com/intervigil/micdroiddonate/Mic.java
case R.id.options:
Intent preferencesIntent = new Intent(getBaseContext(), Preferences.class);
startActivityForResult(preferencesIntent, Constants.PREFERENCE_INTENT_CODE);
break;
case R.id.help:
DialogHelper.showWarning(Mic.this, R.string.help_title, R.string.help_text);
break;
case R.id.about:
DialogHelper.showWarning(Mic.this, R.string.about_title, R.string.about_text);
break;
case R.id.quit:
finish();
break;
=======
case R.id.options:
Intent preferencesIntent = new Intent(getBaseContext(),
Preferences.class);
startActivityForResult(preferencesIntent,
Constants.PREFERENCE_INTENT_CODE);
break;
case R.id.donate:
Intent marketSearchIntent = new Intent(Intent.ACTION_SEARCH);
marketSearchIntent.setPackage("com.android.vending");
marketSearchIntent.putExtra("query", "micdroid donate");
marketSearchIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(marketSearchIntent);
break;
case R.id.help:
DialogHelper.showWarning(Mic.this, R.string.help_title,
R.string.help_text);
break;
case R.id.about:
DialogHelper.showWarning(Mic.this, R.string.about_title,
R.string.about_text);
break;
case R.id.quit:
finish();
break;
>>>>>>> 1a87a67f82ab83d0fe20e438c7851662c9d2fb66:src/com/intervigil/micdroid/Mic.java
}
return true;
} |
| Solution content |
|---|
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.options:
Intent preferencesIntent = new Intent(getBaseContext(),
Preferences.class);
startActivityForResult(preferencesIntent,
Constants.PREFERENCE_INTENT_CODE);
break;
case R.id.help:
DialogHelper.showWarning(Mic.this, R.string.help_title,
R.string.help_text);
break;
case R.id.about:
DialogHelper.showWarning(Mic.this, R.string.about_title,
R.string.about_text);
break;
case R.id.quit:
finish();
break;
}
return true;
} |
| File |
|---|
| Mic.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Break statement |
| Case statement |
| Method invocation |
| Variable |