Git Merge some folder
<p>I have two git local branches named A and B (which points to the remote branches origin/A and origin/B.</p>

<pre><code>Branch - A:

Folder-1
   File-11
   File-12
Folder-2
   File-21
   File-22

Branch - B:
Folder-2
   File-22
   File-23
Folder-3
   File-31
   File-32
</code></pre>

<p>I want to merge branch B with branch A. </p>

<pre><code>git checkout A
git merge B
</code></pre>

<p>The final out come should be like this.</p>

<pre><code>Branch - A:
Folder-1
   File-11
   File-12
Folder-2
   File-21
   File-22 (Branch -A file).
Folder-3
   File-31
   File-32
</code></pre>

<p>Merge Folder-3 alone, keep Folder-1 and Folder-2 from branch A.</p>

<p>The basic requirement is, I should not loss logs (and commits) history.</p>

<p>How to do it?</p>

<p>Thanks in advance.</p>