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

Howto: Merge Branch Into Trunk

From: Ali Yakout <ali.yakout_at_gmail.com>
Date: Wed, 25 Jun 2008 14:21:40 +0300

Hi,

I'm using Smartsvn as my subversion client, I'm trying to merge my branch to
the trunk (I use Modify->Modify from URL), the merge succeeds but the
changes are not actually "merged" into the trunk, instead it is "replaced"
by the branch.

I tried also the command line merge as in <
http://www.sepcot.com/blog/2007/04/SVN-Merge-Branch-Trunk> tutorial but I
got the same results.

How can I do real merges?

Thanks,
Ali
Received on 2008-06-25 13:22:05 CEST

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