I would like to commit my changes in the branch and add those changes to the trunk version using the built-in svn tool in Android Studio. How can I do it?
Should I expect this kind of feature from this built-in tool or should I use an external tool like TurtoiseSVN?
A trunk in SVN is main development area, where major development happens. A branch in SVN is sub development area where parallel development on different functionalities happens. After completion of a functionality, a branch is usually merged back into trunk.
5 years later...
I am using Android Studio 3.1.5 and SVN.
To merge back a branch to its trunk:
-> TortoiseSVN -> Switch
.Version Control -> Subversion Working Copies Information -> Refresh
. See if URL field points to your trunk.Version Control -> Subversion Working Copies Information -> Merge From...
. In the small pop-up window, select the branch you want to merge to trunk. It may also ask for which directory or file in the said branch you want to merge. Make the appropriate selection.Select Merge Variant
window, most of the time I select Merge All because that is usually the goal. Click OK.NOTE: I prefer merging the trunk to my branch first. Resolve the conflicts in the branch, then finally, merge back to trunk.
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