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

RE: Merging a branch back to trunk

From: Méresse Christophe <christophe.meresse_at_nagra.com>
Date: 2006-11-28 17:40:15 CET

> From: Christoph Bartoschek [mailto:bartoschek@or.uni-bonn.de]
> Sent: mardi, 28. novembre 2006 17:06
> To: users@subversion.tigris.org
> Subject: Merging a branch back to trunk
[snip]
> what is the best procedure to merge a branch with lots of
> changes back to
> trunk?
> The subversion book suggests using merge with the changes
> between the split
> and the current branch version. However this would mean that
> I have to
> resolve all the conflicts again that I resolved when I ported
> changes from
> trunk to the branch.
[snip]
> What is recommended?

If you are sure that you have merge the trunk to the branch yet, you can merge the diff between the HEAD of trunk and the HEAD of branch (Thus you should not encounter any conflict).

It's the case "Merge Two Different Trees" quite well explained in the TortoiseSVN documentation: <http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-merge.html#tsvn-dug-merge-2>

Regards,
Christophe

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Nov 28 17:41:01 2006

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