Depending on whether you're rebasing (Most do) or merging, the conflict resolution dialog ("yours" vs "theirs") can be impossible to determine unless you manually review the commit id in the log.
For those in the team that aren't programmers it is more or less impossible to understand.
The resolution dialog should be expanded to include far more information. At a minimum one could include the full commit message for the conflicting commits.
Customer support service by UserEcho