In Atelier when resolving conflicts with the server the screen shows the Local copy and Server copy and the differences, but depending on where the difference is you cannot tell what what the document is, you need to scroll to the top to see what it is before deciding what to do. It should indicate the class or routine name beside "Conflicting Server documents"
Good suggestion, though you somehow managed to post it in the Developer Community Feedback community/group rather than the Atelier one. There's still room for improvement in the DC's user interface.
I think you can edit your post and change what's selected in the Group list, setting it to "Atelier" instead of "Developer Community Feedback".