title: git pull merges automatically
body: <p>I've a <code>master</code> branch and a <code>feature_swap</code> branch. I want to continue working on these two branches in parallel. I did some change on <code>master</code> and then committed. I wanted to apply some algorithm changes of <code>master</code> to <code>feature_swap</code> branch and see how that version works. So I did</p>
  <pre><code>git pull origin feature_swap
  </code></pre>
  <p>and got this message</p>
  <pre><code> * branch            feature_swap -&gt; FETCH_HEAD
  Auto-merging collator.h
  Merge made by recursive.
  </code></pre>
  <p>I don't want to merge. Rather I just want to put some selected changes that I applied on <code>master</code> to <code>feature_swap</code> (maybe by copy pasting). And if that fits my expectation, I'll make another commit to that branch with those changes. Which I again want paralally.</p>
  <p>I'm afraid, I'vent done a <code>git push</code> yet. I can see <code>merge branch 'feature_swap'</code> in <code>git log</code>. What I need to do now to restore the state ?</p>