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

SVN Merge Conflicts Issue

From: Johntyb <jonbowlas_at_googlemail.com>
Date: Mon, 30 Jun 2008 05:10:46 -0700 (PDT)

Hi All,

When I merge my Working copy with a branch I get conflicts on almost
all of the files merged. However when I 'edit conflicts' I can see
absolutly no difference between either of the files (the WC or the
Branch) so why is this showing up as a conflict?

Any advice on this issue would be much appreciated as I don't want to
have to look thorough hundreds of files to resolve these (non)
'conflicts' manually.

Cheers

Jon

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-06-30 14:29:26 CEST

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