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

Re: Auto Merge but conflict?

From: Andreas Stieger <andreas.stieger_at_gmx.de>
Date: Mon, 15 Nov 2010 08:26:06 +0000

Hi,

On Monday 15 Nov 2010 02:21:40 you wrote:
> 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?

This is most commonly caused by different line ending styles or encoding
character set. Merge tools silently fix them but the subversion merge
operation (also during updates) shows a conflict by default. Check that
person's IDE or editor settings and use one line ending style and source
encoding throughout the project. Also read about the svn:eol-style property.

Andreas

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-11-15 09:26:20 CET

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