svn merge says I have conflicts in repository when files have not been updated ?
From: Francois Beausoleil <fbos_at_users.sourceforge.net>
Date: 2003-07-16 19:29:13 CEST
Hi !
I have a repository in which I am trying to port changes from a branch to
Now, when I run the following commands, svn gives me conflicts:
D:\wc>svn merge http://.../branches/A@7 http://.../branches/A@8
Why are these files in conflict ? Last time they were updated was in
I am using Subversion
On Win2K SP3.
Thanks !
---------------------------------------------------------------------
|
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.