Adding files in two copies

Hello,

I have a question on conflicts in following scenario:

Having two identical working copies A and B I create a file named X in A.
Then I create file X in B with different data. After adding X and commiting
in A I update working copy B. Log says about X: "merged", but the file
contains unchanged data written in B. Now my question: why there is no
conflict?

Regards,
Peter from Poland

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-04-05 14:22:09 CEST