title: How do I finish the merge after resolving my merge conflicts?
body: <p>I've read the <a href="https://book.git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging" rel="noreferrer">Basic Branching and Merging</a> section of the Git Community Book.</p>
  
  <p>So I follow it and create one branch: <code>experimental</code>.</p>
  
  <p>Then I:</p>
  
  <ol>
  <li>switch to experimental branch (git checkout experimental)</li>
  <li>make a bunch of changes</li>
  <li>commit it (git commit -a)</li>
  <li>switch to master branch (git checkout master)</li>
  <li>make some changes and commit there</li>
  <li>switch back to experimental (git checkout experimental)</li>
  <li>merge master change to experimental (git merge master)</li>
  <li><p>there are some conflicts but after I resolve them, I did 'git add myfile'</p></li>
  <li><p>And now i am stuck, I can't move back to master</p></li>
  </ol>
  
  <p>when I do </p>
  
  <pre><code> $ git checkout master
  error: Entry 'res/layout/my_item.xml' would be overwritten by merge. Cannot merge.
  </code></pre>
  
  <p>and I did:</p>
  
  <pre><code>$ git rebase --abort
  </code></pre>
  
  <p>No rebase in progress?</p>
  
  <p>and I did :</p>
  
  <pre><code>$  git add res/layout/socialhub_list_item.xml
  $ git checkout master
  error: Entry 'res/layout/my_item.xml' would be overwritten by merge. Cannot merge.
  </code></pre>
  
  <p>What can I do so that I can go back to my master branch?</p>