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

On 16 Jul 2003 12:36:54 -0500, "Ben Collins-Sussman" <sussman@collab.net>
said:
> "Francois Beausoleil" <fbos@users.sourceforge.net> writes:
>
> > D:\wc>svn merge http://.../branches/A@7 http://.../branches/A@8
> > C compta.lib
> > C COMPTA.APP
> > 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.
>

Ooops, sorry. Why didn't go search beforehand...

Bye !
François
Developer of Java Gui Builder
http://jgb.sourceforge.net/

---------------------------------------------------------------------
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:52:25 2003