In the "Merge Conflict" dialog, there are two checkboxes between the list and the mapview. With them the user can control, what version of a feature he wants to see: "Local" or "Remote" (or both or none). But the captions of the two checkboxes are interchanged:
When I check "Local", I see the version of the other branch and not my current branch. And if I check "Remote", I see the version of my current branch.
So the captions of the two buttons should be changed: "Local" becomes "Remote" and "Remote" becomes "Local".
BTW: That would also fit to the buttons "Solve with remote feature" and "Solve with local feature". They are correctly labelled and do the expected actions.
In the "Merge Conflict" dialog, there are two checkboxes between the list and the mapview. With them the user can control, what version of a feature he wants to see: "Local" or "Remote" (or both or none). But the captions of the two checkboxes are interchanged: When I check "Local", I see the version of the other branch and not my current branch. And if I check "Remote", I see the version of my current branch. So the captions of the two buttons should be changed: "Local" becomes "Remote" and "Remote" becomes "Local".
BTW: That would also fit to the buttons "Solve with remote feature" and "Solve with local feature". They are correctly labelled and do the expected actions.