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

Re: Svn Merge - how to configure

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Mon, 6 Oct 2008 22:34:02 +0100

2008/10/6 Menny <rorealm_at_yahoo.com>:
>
> When I merge my Working copy with a branch I get many conflicts, in fact
> there only several files with the real conflicts in the red color, that i
> should fix myself, the others files actually doesn't have conflicts in red
> colors, but they are still reported as conflicted files. So every time i'm
> making a merge i should open, save, close, and finally make that file
> -"conflict resolved" a huge amount of files, that makes no sense, just
> useless work.
>
> So the question, could i somehow force the svn merge to ignore files without
> real conflicts(red color) and merge all of them by itself, so my work would
> be only solving the real conflicts(red color)?

Sounds like you are changing the line endings. Try using the
svn:eol-style property to solve this problem.

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-10-06 23:34:10 CEST

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