CODEWITHSUNDEEP
javaeclipsesvnmergeeclipse-plugin
emilly
emilly

Reputation: 10538

How to merge SVN branch to trunk?

I need to merge branch(SVN) to trunk. we had cut branch from trunk at time T1. After that development continued on trunk and branch. Now i want to merge all branch changes to trunk. What are the steps for it and tool to achieve the same.

Should i take first trunk changes in to branch and then merge branch changes to trunk orShould i directly marge branch changes to trunk ?

What is the best tool for achieving the same. I am using Eclipse, svn, Tortoise SVN client in my project

I am sure there must be some tool like eclipse plugin or some other clientto achieve the same, but if somebody can point me great ones, it would be a great help

Upvotes: 2

Views: 1374

Answers (2)

M A
M A

Reputation: 72884

For Eclipse, you can use Subclipse. When installing the plugin, there is an option to install the CollabNet Merge client that helps resolving conflicts during a merge in case they exist between the branch and the trunk.

Upvotes: 1

duffymo
duffymo

Reputation: 309028

IntelliJ from JetBrains is the best Java IDE on the market. It has tools for working with Subversion and Git that make this easy.

BeyondCompare is a terrific tool. Maybe that can help you.

Keep it simple - just merge the branch into the trunk and you're done.

The bigger the merge, the harder it is.

Trunk is a convention, but it's just another name for a branch that is given some special status. Another way to look at it is to simply cut future branches off the one you have. Tell future developers to check out the latest branch, not trunk. Just keep going. Forget about trunk.

Upvotes: 1

Related Questions