| Chunk |
|---|
| Conflicting content |
|---|
public View newView(Context context, Cursor cursor, ViewGroup parent) {
View ret = mFactory.inflate(R.layout.alarm_time, parent, false);
<<<<<<< HEAD
DigitalClock digitalClock =
(DigitalClock) ret.findViewById(R.id.digitalClock);
=======
DigitalClock digitalClock = (DigitalClock) ret.findViewById(R.id.digitalClock);
>>>>>>> 90c4833f94f4775f747333f8bd67107364a1d9c1
digitalClock.setLive(false);
return ret;
} |
| Solution content |
|---|
public View newView(Context context, Cursor cursor, ViewGroup parent) {
View ret = mFactory.inflate(R.layout.alarm_time, parent, false);
DigitalClock digitalClock =
(DigitalClock) ret.findViewById(R.id.digitalClock);
digitalClock.setLive(false);
return ret;
} |
| File |
|---|
| AlarmClock.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Cast expression |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
finish();
return;
}
/* load alarm details from database */
Alarm alarm = Alarms.getAlarm(getContentResolver(), mId);
<<<<<<< HEAD
// Bad alarm, bail to avoid a NPE.
if (alarm == null) {
mEnabled = alarm.enabled;
=======
mEnabledPref.setChecked(alarm.enabled);
>>>>>>> 90c4833f94f4775f747333f8bd67107364a1d9c1
mLabel.setText(alarm.label);
mLabel.setSummary(alarm.label);
mHour = alarm.hour; |
| Solution content |
|---|
/* load alarm details from database */
Alarm alarm = Alarms.getAlarm(getContentResolver(), mId);
// Bad alarm, bail to avoid a NPE.
if (alarm == null) {
finish();
return;
}
mEnabledPref.setChecked(alarm.enabled);
mLabel.setText(alarm.label);
mLabel.setSummary(alarm.label);
mHour = alarm.hour; |
| File |
|---|
| SetAlarm.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| If statement |
| Method invocation |
| Variable |