Resolving Conflicts

Hi,

I have experienced an issue in the way conflicts are resolved.
Basically I had a conflicted file which had no conflicts within the file. Everything looked to be merged correctly. So I right-clicked the "red" file from the "check for modifications" screen and selected the "Resolved" option.
This however caused some merge information to be part of the file. For example:

<<<<<<< .working

>>>>>>> .merge-right.r13749

I redid the merge and selected "Edit Conflict". In the new window I selected "Mark as Resolved", this merged the file correctly.

Why do both these options have different behaviour?

#############################################################################################
The information transmitted is intended only for the person or entity to which it
is addressed and may contain confidential and/or privileged material.
Any review, retransmission, dissemination or other use of, or taking of any action
in reliance upon, this information by persons or entities other than the intended
recipient is prohibited. If you received this in error, please contact the sender and
delete the material from any computer.

Furthermore, the information contained in this message, and any attachments thereto, is
for information purposes only and may contain the personal views and opinions of the
author, which are not necessarily the views and opinions of the company.
#############################################################################################

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-10-25 14:10:35 CEST