[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: Craig White <craigwhite_at_azapple.com>
Date: 2006-03-21 15:51:27 CET

On Tue, 2006-03-21 at 02:08 -0700, Bob Proulx wrote:
> 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
>

----
I've been through that book and that is why I'm so confused. All I
wanted to do was to merge my branch into the trunk - the tag version was
for my safety.
I can't seem to merge into the existing trunk.
Craig
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Mar 21 16:01:39 2006

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