merge one local branch into another local branch
<p>I have multiple branches which are branched off the master (each in a separate subdirectory).</p>

<ul>
<li>Branch1: new development, not yet completely finished</li>
<li>Branch2: hotfix for a problem, but still under test</li>
<li>Branch3: mess around branch, which I will not restore</li>
</ul>

<p>Before testing of the hotfix is finished I would like to have the code already available in Branch1, so I can continue developing with the fix in place.<br />
(But since my experience with git is not that much I first started to play around with merge in a 3rd branch, especially created to mess around in, before I mess up either Branch1 or Branch2)</p>

<p>In my 3rd branch I first tried the following:</p>

<pre><code>git merge feature/Branch1
</code></pre>

<p>but this gave the following error:</p>

<pre><code>fatal: 'feature/Branch1' does not point to a commit
</code></pre>

<p>I next did a commit -a in my Branch1 and tried again, but it keeps giving the same error.</p>

<p>What am I doing wrong? What should I do to merge the code from - in this case - Branch1 with Branch3?</p>