I forget how to do this every few months, so here’s a reminder – when merging changes from /trunk to the branch you’re working in:
PS: If there’s a lot of work going on in trunk… Merge often!
In eclipse, your working copy is pointed to the branch in question.
Team > Merge
From:
URL to the trunk
Revision: This is the revision # where you last branched/merged (good reason to make notes in SVN log).
To:
Use “From:” URL
Merge to HEAD revision
Hit Merge
Now you should be able to use Eclipse to resolve conflicts at will.
This helpful tidbit shed some light for me:
First of all, “From:” and “To:” do /not/ refer to source and target of
the merge-operation. The target of the merge-operation is /always/ your
current working-copy.
“From:” and “To:” refer to the first and the last revision to be used
during the merge-operation (or: to be considered by the merge-algorithm).
Please note that the last sentence is not really precise at all, for you
should check chapter 4 of the SVN-book
(http://svnbook.red-bean.com/en/1.4/svn.branchmerge.html) for more info.
src: http://www.nabble.com/Merging-to-branch-from-old-branch-trunk–td15459849.html