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

Re: how to merge a feature branch back to trunk?

From: Benjamin Smith-Mannschott <bsmith.occs_at_gmail.com>
Date: Sun, 7 Sep 2008 11:04:11 +0200

On Sep 7, 2008, at 06:51, Harshad wrote:

> Martin Bischoff wrote:
>> I have created a feature branch which I will have to merge back to
>> trunk soon. I'd like some advice about how to best perform that merge
>> operation.
> I found this useful:
> http://www.technoids.org/svnmerge.html

Note: this was written before SVN 1.5 introduced merge tracking, so
there's no discussion of the --reintegrate option.

// ben

To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-09-07 11:05:15 CEST

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.