[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: <cmpilato_at_collab.net>
Date: 2003-07-16 19:42:00 CEST

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

> Well, I merged twice. The first time, from trunk/ to branch/ (r7), then
> I committed changes in branch (r8).
>
> My next step is to merge the changes from branch/ back into trunk/.

Oh, oh. Sorry. Misread. Thanks.

---------------------------------------------------------------------
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:42:10 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.