Merging of branch to trunk in SVN using Eclipse

Question

I am looking forward to merge my codes which I developed in a branch of SVN to the trunk. I am using Eclipse and I have been using Team->Commit to commit my updates to the SVN.

Answer 1

I would like to add for Point 8 .Review changes and resolve conflicts. ---

When working on conflicts manually- when you do copy from right to left on chunks of code - Be careful Sometimes chunk of code gets added, sometimes it properly replaces the chunk. Make sure there is no duplicate chunk of code.

Also, this is helpful-- What is the proper way to do a Subversion merge in Eclipse?