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

Re: SVN Merge Conflicts Issue

From: Johntyb <jonbowlas_at_googlemail.com>
Date: Mon, 30 Jun 2008 06:57:45 -0700 (PDT)

Cheers Andy, much appreciated.

Jon

On Jun 30, 2:16 pm, "Andy Levy" <andy.l..._at_gmail.com> wrote:
> On Mon, Jun 30, 2008 at 8:59 AM, Johntyb <jonbow..._at_googlemail.com> wrote:
> > Ok, I just tried WinMerge to see if that would produce the same
> > results, well it does but helpfully it tells me that the files use
> > different carriage return types. So my next question is where can I
> > set up TSVN to 'ignore carriage return differences' as in WinMerge?
>
> http://svnbook.red-bean.com/en/1.4/svn.advanced.props.file-portabilit...
>
>
>
> > On Jun 30, 1:40 pm, "Andy Levy" <andy.l..._at_gmail.com> wrote:
> >> On Mon, Jun 30, 2008 at 8:10 AM, Johntyb <jonbow..._at_googlemail.com> wrote:
> >> > 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.
>
> >> Make sure your diff tool is showing you differences in EOL markers and
> >> other whitespace. They may not be immediately visible.
>
> >> ---------------------------------------------------------------------
> >> To unsubscribe, e-mail: users-unsubscr..._at_tortoisesvn.tigris.org
> >> For additional commands, e-mail: users-h..._at_tortoisesvn.tigris.org
>
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: users-unsubscr..._at_tortoisesvn.tigris.org
> > For additional commands, e-mail: users-h..._at_tortoisesvn.tigris.org
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscr..._at_tortoisesvn.tigris.org
> For additional commands, e-mail: users-h..._at_tortoisesvn.tigris.org

---------------------------------------------------------------------
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 16:17:19 CEST

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