Menu
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?
254
To switch back, just provide the URL to the location in the repository from which you originally checked out your working copy: $ svn switch http://svn.red-bean.com/repos/trunk/vendors .
It may not refer to the revision you think it does if someone else made a commit after your last update. If you leave the range of revisions empty or have the radio button all revisions checked, then Subversion merges all not-yet merged revisions. This is known as a reintegrate or automatic merge.
The trunk is the main line of development in a SVN repository. A branch is a side-line of development created to make larger, experimental or disrupting work without annoying users of the trunk version.
For Netbeans 8.2 you can use "Merge Changes..." to do that (not sure if this is also in netbeans 7.x available):
More information are here: https://netbeans.org/kb/docs/ide/subversion.html#merging
88
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
