svnmergenetbeans-7.1svn-reintegratesvn-merge-reintegrate

How to reintegrate a SVN branch into trunk with Netbeans?

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?

Solution

  • 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