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

Re: svn merge says I have conflicts in repository when files have not been updated ?

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-07-16 19:36:54 CEST

"Francois Beausoleil" <fbos@users.sourceforge.net> writes:

> D:\wc>svn merge http://.../branches/A@7 http://.../branches/A@8
> C compta.lib
> C compta.exe
> Why are these files in conflict ? Last time they were updated was in
> trunk/, at rev 1. They were not modified in between. There's probably
> something I do not understand about branching and merging here...

This is issue #1319.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jul 16 19:39:02 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.