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

Re: Strange conflicts during merge

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-05-20 17:04:07 CEST

Philip Martin <philip@codematters.co.uk> writes:

> Ben Collins-Sussman <sussman@collab.net> writes:
> >
> > Interesting that these are "C +", and that they seem to binary files.
>
> Indeed, it's a bug with merges that add binary files. The problem
> above can be reproduced

I've raised issue 1319. 

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue May 20 17:05:24 2003

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

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