Re: [Subclipse-users] branching and merging

"Antjoule, William - MIAMI" <WAntjoule@ncl.com> wrote on 07/24/2006
02:41:00 PM:

> I have created a branch in are SVN repository and now am out of sync
with
> the main trunk.
>
> Is their a way of updating my branch with the code that is now in the
main
> trunk and keeping the changes that I have made to my branch out of the
main trunk?

Yes, you have to use merge, to merge the changes that have occurred in
trunk into your branch.

Here is a link to the documentation we include with Subclipse:

http://svn.collab.net/subclipse/help/topic/org.tigris.subversion.subclipse.doc/html/reference/merge.html

Pressing Help on the merge dialog will lead to the same page. This page,
and some of its links should give you a starting point.

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Mon Jul 24 20:48:23 2006