How to reintegrate a SVN branch into trunk with Netbeans?

Question

I created a branch from trunk. As development on my branch is finished, I want to merge (reintegrate) my branch into trunk. Is there an option or setting to enable? It seems Netbeans 7.1 isn't able to reintegrate a branch into trunk.

Am I wrong?

Answer 1

For Netbeans 8.2 you can use "Merge Changes..." to do that (not sure if this is also in netbeans 7.x available):

1. Right click your project/folder/file you want to merge
2. Choose "Subversion" - "Copy" - "Merge Changes..."
3. Following the merging assistent

More information are here: https://netbeans.org/kb/docs/ide/subversion.html#merging

Answer 2

just use another SVN user interface, for example TortoiseSVN or the svn command line tool, as those can do merges and will work on the same data as Netbeans SVN.

If you have some time to spare, you could read the section "SVN merges are broken" of http://ventspace.wordpress.com/2011/03/09/understanding-subversions-problems/ and learn about distributed version control systems like git or mercurial that were created (amongst other reasons) to provide working merging in version control.