| Chunk |
|---|
| Conflicting content |
|---|
break; case MODIFY_CSS_RECORD: asyncResult = this.cssManager.modifyCssRecord((CssRecord) bean.getProfile()); <<<<<<< HEAD break; ======= break; >>>>>>> a94daaeb43ddc43ef5c745ac77c4ebdc84f791d8 case GET_CSS_FRIENDS: asyncFriendsAdsResult = this.cssManager.getCssFriends(); break; |
| Solution content |
|---|
break; case MODIFY_CSS_RECORD: asyncResult = this.cssManager.modifyCssRecord((CssRecord) bean.getProfile()); break; case GET_CSS_FRIENDS: asyncFriendsAdsResult = this.cssManager.getCssFriends(); break; |
| File |
|---|
| CommsServer.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Break statement |
| Chunk |
|---|
| Conflicting content |
|---|
CssManagerResultBean resultBean = new CssManagerResultBean();
resultBean.setResult(result);
<<<<<<< HEAD
resultBean.setResultCssFriendList(getFriendsResult);
resultBean.setResultCssAdvertisementRecord(suggestedFriendsResult);
=======
resultBean.setResultAdvertList(friendsAdsResult);
>>>>>>> a94daaeb43ddc43ef5c745ac77c4ebdc84f791d8
Dbc.ensure("CSSManager result bean cannot be null", resultBean != null);
return resultBean; |
| Solution content |
|---|
CssManagerResultBean resultBean = new CssManagerResultBean();
resultBean.setResult(result);
resultBean.setResultAdvertList(friendsAdsResult);
Dbc.ensure("CSSManager result bean cannot be null", resultBean != null);
return resultBean; |
| File |
|---|
| CommsServer.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |