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?
Asked
Active
Viewed 2,346 times
6
-
+1, I would very much like to know this, too. – nem75 Apr 11 '12 at 13:33
-
+1 Me too, it just seems not to be possible without CLI – nico gawenda Apr 26 '12 at 12:40
-
Did you create the branch with Netbeans? You could just use the command line svn merge --non-interactive {branch url}. The --non-interactive is to avoid asking what to do with conflicts, then you just resolve them and commit. TortoiseSVN if you are on Windows does provide a GUI for merges too if you don't want to use the command line. – ronnyfm Jun 27 '13 at 15:33
2 Answers
4
For Netbeans 8.2 you can use "Merge Changes..." to do that (not sure if this is also in netbeans 7.x available):
- Right click your project/folder/file you want to merge
- Choose "Subversion" - "Copy" - "Merge Changes..."
- Following the merging assistent
More information are here: https://netbeans.org/kb/docs/ide/subversion.html#merging
Steffen
- 2,500
- 4
- 31
- 47
-1
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.
mnagel
- 6,729
- 4
- 31
- 66