Edit Tree Conflicts dialog confusion

I've just done a merge. I had conflicts. I postpone them all, so I can deal with them later.

I do a "Check for Modifications". I have a file with a Text status of "normal, tree conflict".

I right click, select "Edit Tree Conflicts".

In the "Edit Tree Conflicts" dialog, I see "Conflict Sources", with "Source Left:" and "Source Right:", each with a revision number url.

Beneath them, I see the question "How do you want to resolve this conflict?" Under that, there are two buttons:

"Keep the file from the repository" and "Keep the local file".

Which of the two files is "Source Left", and which is "Source Right"?

Differences in terminology between different parts of the app are confusing enough. Differences in terminology within a single dialog are worse.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2634152

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-07-16 21:12:18 CEST