| Chunk |
|---|
| Conflicting content |
|---|
}
public ServiceProviderUserProfile fetchUserProfile(FacebookApi serviceApi) {
<<<<<<< HEAD
FacebookProfile profile = serviceApi.userOperations().getUserProfile();
=======
FacebookProfile profile = serviceApi.userOperations().getUserProfile();
>>>>>>> 3c07e2a0547f1c2f888afcba8a2938febf770ba5
return new ServiceProviderUserProfile(profile.getName(), profile.getFirstName(), profile.getLastName(), profile.getEmail(), profile.getUsername());
}
|
| Solution content |
|---|
}
public ServiceProviderUserProfile fetchUserProfile(FacebookApi serviceApi) {
FacebookProfile profile = serviceApi.userOperations().getUserProfile();
return new ServiceProviderUserProfile(profile.getName(), profile.getFirstName(), profile.getLastName(), profile.getEmail(), profile.getUsername());
}
|
| File |
|---|
| FacebookServiceApiAdapter.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
}
public ServiceProviderUserProfile fetchUserProfile(TwitterApi serviceApi) {
<<<<<<< HEAD
TwitterProfile profile = serviceApi.userOperations().getUserProfile();
=======
TwitterProfile profile = serviceApi.userOperations().getUserProfile();
>>>>>>> 3c07e2a0547f1c2f888afcba8a2938febf770ba5
return new ServiceProviderUserProfile(profile.getName(), null, null, null, profile.getScreenName());
}
|
| Solution content |
|---|
}
public ServiceProviderUserProfile fetchUserProfile(TwitterApi serviceApi) {
TwitterProfile profile = serviceApi.userOperations().getUserProfile();
return new ServiceProviderUserProfile(profile.getName(), null, null, null, profile.getScreenName());
}
|
| File |
|---|
| TwitterServiceApiAdapter.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |