|
| Re: Merging branches [message #13295 is a reply to message #13154] |
Sat, 09 February 2008 10:13  |
Eclipse User |
|
|
|
Originally posted by: alexander.gurov.polarion.org
demi wrote:
> I'm confused at how to merge. I created a branch to work on some new
> stuff. I created it by copying a project from my trunk. So now I want to
> merge my changes back into the trunk. What is the exact procedure to do
> this, assuming people have been actively working on the trunk and their
> changes to exist in my branch.
Subversive supports merge view similar to CVS one. So, you can chek if it
is enabled in plug-in preferences (Window->Preferences->Team->SVN->SVN
Client->Use SVN Merge View) then simply call Team->Merge action on
required projects, select a resource merging with required, select start
and stop revisions, press "Ok" and check in Merge View what changes you
want to merge into your working copy.
More about the merge process in SVN please read at:
http://svnbook.red-bean.com/index.en.html
|
|
|
Powered by
FUDForum. Page generated in 0.04321 seconds
] 
Search
Help
Register
Login
Home
