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

Re: Re: Keeping a branch updated

From: Andrew Durdin <adurdin_at_gmail.com>
Date: 2006-09-04 11:46:29 CEST

On 9/1/06, Mark Phippard <markp@softlanding.com> wrote:
>
> When you want to merge back you have to do a final synch merge of your
> branch to update it to trunk. Then just do a merge back to trunk where
> the old URL is trunk and the new URL is the branch. This will show just
> the differences between trunk and the branch.

Thanks Mark! That's the answer I was looking for but couldn't figure
out. It makes sense now.

Cheers, Andrew.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Sep 4 11:47:56 2006

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