title: Git merge mistake
body: <p>I have made an mistake when merging with git. I have a master branch and another branch called mars.</p>
  
  <p>The master branch contains very old code and I do not want to work with it. However, when I tried to get the latest code of mars, I did:</p>
  
  <pre><code>git fetch
  git merge origin/master       &lt;------ This is a mistake as I should use "git merge origin/mars"
  </code></pre>
  
  <p>The last command failed with a merge failure and asked me to fix the conflict. I fixed the conflict and did</p>
  
  <pre><code>git stash
  git stash drop
  </code></pre>
  
  <p>I think this should drop whatever I just manually solved confliction.</p>
  
  <p>But I am not sure whether I have merged something from master to mars mistakenly. If so, the mars branch is contaminated.</p>
  
  <p>Is there anyway I can confirm my local mars is not merged with anything from master? (it is not contanimated).</p>
  
  <p>Many thanks.</p>