| Chunk |
|---|
| Conflicting content |
|---|
super.bindGroupView(view, context, cursor, isExpanded);
TextView groupname = (TextView)view.findViewById(R.id.groupname);
if (cursor.getString(cursor.getColumnIndexOrThrow(RosterConstants.GROUP)).length() == 0) {
<<<<<<< HEAD
groupname.setText(R.string.default_group);
=======
TextView groupname = (TextView)view.findViewById(R.id.groupname);
groupname.setText(mConfig.enableGroups ? R.string.default_group : R.string.all_contacts_group);
>>>>>>> 690d48b6011ba6397f29cad3361a63779d862e44
}
groupname.setTypeface(mRosterTypeface);
} |
| Solution content |
|---|
super.bindGroupView(view, context, cursor, isExpanded);
TextView groupname = (TextView)view.findViewById(R.id.groupname);
if (cursor.getString(cursor.getColumnIndexOrThrow(RosterConstants.GROUP)).length() == 0) {
groupname.setText(mConfig.enableGroups ? R.string.default_group : R.string.all_contacts_group);
}
groupname.setTypeface(mRosterTypeface);
} |
| File |
|---|
| MainWindow.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Cast expression |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
}
getMessageView().setText(message);
getMessageView().setTextSize(TypedValue.COMPLEX_UNIT_SP, chatWindow.mChatFontSize);
<<<<<<< HEAD
getMessageView().setTypeface(mRosterTypeface);
=======
getDateView().setTextSize(TypedValue.COMPLEX_UNIT_SP, chatWindow.mChatFontSize*2/3);
getFromView().setTextSize(TypedValue.COMPLEX_UNIT_SP, chatWindow.mChatFontSize*2/3);
>>>>>>> 690d48b6011ba6397f29cad3361a63779d862e44
}
TextView getDateView() { |
| Solution content |
|---|
}
getMessageView().setText(message);
getMessageView().setTextSize(TypedValue.COMPLEX_UNIT_SP, chatWindow.mChatFontSize);
getMessageView().setTypeface(mRosterTypeface);
getDateView().setTextSize(TypedValue.COMPLEX_UNIT_SP, chatWindow.mChatFontSize*2/3);
getFromView().setTextSize(TypedValue.COMPLEX_UNIT_SP, chatWindow.mChatFontSize*2/3);
}
TextView getDateView() { |
| File |
|---|
| ChatWindow.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Method invocation |