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

Re: Weird conflicts for no reason

From: Robert Dailey <rcdailey_at_gmail.com>
Date: Fri, 10 Oct 2008 15:44:35 -0500

On Fri, Oct 10, 2008 at 3:18 PM, Robert Dailey <rcdailey_at_gmail.com> wrote:

> I'll give you access to the repository. I'll email the information and
> instructions to your personal email address.

Interesting. I moved the repository to a different server, which essentially
switched from the http:// protocol to svn://, and doing the *exact* same
merge process results in *NO* conflicts. I'm wondering if Apache is doing
something funny to the files?
Received on 2008-10-10 22:44:49 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.