Android Studio - unable to merge from SVN branch
<p>We have decided to follow the process of creating a new SVN branch for every new feature that we add to our mobile app. The ultimate goal behind this is to preserve the history for every single code change (this doesn't happen when we manually copy project folders into SVN instead of creating &amp; merging branches).</p>

<p>My problem is that so far I am unable to merge changes from one branch to another.</p>

<p><strong>I have already referred the following posts without success:</strong></p>

<ul>
<li><p><a href="https://stackoverflow.com/q/17771977/3287204"><strong>How to merge branch with trunk using SVN in android studio</strong></a>.</p></li>
<li><p><a href="https://stackoverflow.com/q/24393148/3287204"><strong>Android Studio Update Project: Merge vs Rebase vs Branch Default</strong></a>.</p></li>
<li><p><a href="https://stackoverflow.com/q/32627275/3287204"><strong>How to merge branch to SVN with Android studio</strong></a>.</p></li>
<li><p><a href="https://stackoverflow.com/q/35062889"><strong>How do merge specific svn revisions from branch to trunk in Android Studio 2.0</strong></a>.</p></li>
</ul>

<p><strong><em>Here is what I have tried so far:</em></strong></p>

<p>I have two feature branches as can be seen below in <a href="https://tortoisesvn.net/" rel="nofollow noreferrer">Tortoise SVN</a>:</p>

<p><a href="https://i.stack.imgur.com/EXvw5.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/EXvw5.png" alt="enter image description here"></a></p>

<p>I want to merge the changes in the branch <strong>Feature_A3</strong> into branch <strong>Feature_A2</strong>. To do this, I am using the <code>Merge from</code> option in Android Studio's VCS from the A2 working copy:</p>

<p><a href="https://i.stack.imgur.com/5k4mm.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/5k4mm.png" alt="enter image description here"></a></p>

<p>It then asks me to select the branch to merge from (A3) or configure other branches:</p>

<p><a href="https://i.stack.imgur.com/hYpMJ.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/hYpMJ.png" alt="enter image description here"></a></p>

<p>I click on <strong>Configure Branches</strong>, just to show you the existing branch config:</p>

<p><a href="https://i.stack.imgur.com/GlPh8.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/GlPh8.png" alt="enter image description here"></a></p>

<p>As you can see, A2 is the <em>Trunk</em> and A3 is the <em>Branch</em>. <strong><em>Is this correct?</em></strong></p>

<p>It then asks me what part of A3 I want to merge into A2. I select the <code>/src</code> directory (where the relevant changes are present):</p>

<p><a href="https://i.stack.imgur.com/TxuOq.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/TxuOq.png" alt="enter image description here"></a></p>

<p>It then generously gives me three different ways to perform the merge operation:</p>

<p><a href="https://i.stack.imgur.com/PGLzI.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/PGLzI.png" alt="enter image description here"></a></p>

<p>I select the third option as it directly gives me the changes I need to merge:</p>

<p><a href="https://i.stack.imgur.com/F59Xx.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/F59Xx.png" alt="enter image description here"></a></p>

<p>I click on <strong>Merge Selected</strong> and <strong>BAM!!!</strong> I get this error every time:</p>

<p><a href="https://i.stack.imgur.com/iM2fR.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/iM2fR.png" alt="enter image description here"></a></p>

<p>There is no clue as to what the "unresolved conflicts" or "skipped items" are. Why am I getting this error, and what should I do to merge the changes in A3 into A2 ??? Can someone please help ? All answers will be appreciated. Thanks ...</p>

<p>I have been following the official Intellij IDEA documentation below:</p>

<ul>
<li><p><a href="https://www.jetbrains.com/help/idea/2016.1/integrating-changes-to-from-feature-branches.html?origin=old_help" rel="nofollow noreferrer"><strong>Integrating Changes To/From Feature
Branches</strong></a>.</p></li>
<li><p><a href="https://www.jetbrains.com/help/idea/2016.1/merging-deleting-and-comparing-branches.html?origin=old_help" rel="nofollow noreferrer"><strong>Merging, Deleting, and Comparing
Branches</strong></a>.</p></li>
</ul>

<p><strong><em>Please note that:</em></strong></p>

<ul>
<li><p>Currently I am using Subversion, not Git. </p></li>
<li><p>The directory structure of my local working copies is not exactly
identical to that of the SVN repos. Could this be the cause of the error ?</p></li>
</ul>

<p><strong>THE ANSWER ...</strong></p>

<p>Thanks to <a href="https://stackoverflow.com/users/23264/peter-parker">Peter Parker</a> and especially <a href="https://stackoverflow.com/users/2242104/yoav-aharoni">Yoav Aharoni</a> for their valuable feedback. As Yoav correctly pointed out, it was indeed the manner in which the branch locations folder was specified. It needs to be the folder containing the branches, not the branch folders themselves: And as Peter rightly said, checking "Include merged revisions" shows the merged history. I am now able to merge from within the IDE itself, and view the merged history in TortoiseSVN.
NO command line! <strong>YAY!!!</strong></p>

<p>However, one last problem is that I am unable to view the merged history in Android Studio (Intellij IDEA) as described in <a href="https://www.jetbrains.com/help/idea/2016.1/viewing-merge-sources.html?origin=old_help" rel="nofollow noreferrer">Viewing Merge Sources</a>. Does anyone know how to achieve this in Android Studio?</p>