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

Auto Merge but conflict?

From: Edwin <edwintai_at_gmail.com>
Date: Sun, 14 Nov 2010 18:21:40 -0800 (PST)

We use TortoiseSVN-1.6.11.20210-win32-svn-1.6.13 on Window 7
Enterprise edition.Recently,some colleague found their tortoisesvn
didn't auto merge their files.It always show conflict but didn't show
conflict block by tortoise-diff.They need to open file and click
solved and save it every time they update file.Is this kind of normal?
Is there anyone face the same problem?

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-11-15 03:21:49 CET

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.