[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Adding files in two copies

From: ? ? <moje.konto.techniczne_at_gmail.com>
Date: Thu, 5 Apr 2012 14:05:04 +0200


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

Peter from Poland


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

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.