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

Re: newbie question

From: Bob Proulx <bob_at_proulx.com>
Date: 2006-03-21 10:08:56 CET

Craig White wrote:
> I want to merge my 'branch' back into the 'trunk'.
>
> Do I merge the 'branch' version with the 'tag' version into the
> 'trunk' ?
>
> I am somewhat confused on this. Also I am planning on doing this on my
> workstation and then 'committing' the changes on the trunk back to the
> repository...is that how it's all done?

Yes. You pretty much have it. But please read this part of the book
which covers your question in detail.

  http://svnbook.red-bean.com/en/1.1/ch04.html

Bob

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Mar 21 10:10:18 2006

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