Hi all,
A colleague of mine checked in work before me and now I'm trying to merge changes (auto doesn't work) but I don't understand the process.
For example in the left and right panes (my local and the server version respectively) it is showing a deleted line in both (marked as red). However, it is also showing both as a conflict (dashed shading). I'm not sure (a) this is considered a conflict and (b) how I even resolve it. (Do I click on one, both, neither?)
Any help appreciated,
P.