I usually look at their commit logs for that file at that area, I also find it useful to commit the unresolved conflicts when doing a merge and then resolve the

I usually look at their commit logs for that file at that area, I also find it useful to commit the unresolved conflicts when doing a merge and then resolve them in later commits so I can look at what I did later if I need to fix a bad merge