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

Re: [Subclipse-users] Merging a branch into the trunk - how?

From: Michele Campeotto <micampe_at_micampe.it>
Date: 2006-03-27 13:33:17 CEST

On 3/27/06, Karl Auer <kauer@biplane.com.au> wrote:
> I made a branch, then switched to it and have been working on that
> branch for a while. I have a working copy of that branch that is up to
> date. I have no working copy of the trunk revision.
>
> Now I want to merge all the changes from the branch back into the trunk
> (essentially making the trunk the same as the branch).

  You can only merge in a working copy, as a merge requires review and
commit after it has been performed, so you have to checkout the trunk
and then merge your branch in the the trunk working copy.

  mic

--
Michele Campeotto - www.micampe.it
It's psychosomatic. You need a lobotomy. I'll get a saw.
	-- Calvin
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Mon Mar 27 13:33:34 2006

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