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

Re: Problems Merging

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-05-10 23:16:32 CEST

On Mon, 2004-05-10 at 16:10, Stephen Hansen wrote:
> Hi all.
> I'm a fairly new user to Subversion and have been using it on new
> projects around the office, and have run into a bit of a problem with
> merging. I branched /trunk/Python into /branch/omniorb awhile back to do
> some extensive work, and now would like to merge my changes back into
> the trunk. So, I do:
> svn merge

You're making the "classic" mistake trying to compare the trunk with the
branch. Go read this section of the book:


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon May 10 23:21:33 2004

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

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