How to merge branch with trunk using SVN in android studio

Question

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 expec

Answer 1

As it says on this link of IntelliJ Doc (Android Studio and the Android plugin for IntelliJ IDEA are built from the same code)

To merge branch changes back into trunk, you should open trunk working copy and do same steps as when taking changes from trunk into branch (selecting source branch in popup). Additionally, you will be warned:

Merge information gathering rules To be able to merge changes back to trunk in a bunch (using Subversion “--reintegrate”), you should NOT have any merges done on other target that working copy root, i.e. you should not have any svn:mergeinfo properties set in working copy subtree. That’s why when checking what revisions are merge, by default, IntelliJ IDEA would not check merge information in a subtree. But if you somewhy need subtree to be checked, you should go to “Settings | Version Control | VCSs | Subversion” and set “Check svn:mergeinfo in target subtree when preparing for merge”.

More info and full doc can be located at: https://devnet.jetbrains.com/docs/DOC-1203

Edit:

Answering to Error: svn: E195016: Merge tracking not allowed with missing subtrees:

That error occurs when someone deletes something without using Subversion commands. If you were to run svn status on that working copy the same path that Subversion is complaining about should show with a ! in the first column of the output. Try using svn rm instead of OS commands.