title: Different git commit origin master and my server
body: <p>In my local git, </p>
  
  <pre><code>~/my/local/dir/my-repo-name$ rev-parse HEAD
  2978a05ecaa0657220b669fc60f127349f87faf4
  </code></pre>
  
  <p>However in my live-server, I had to <code>git stash</code>, and it gave the following:</p>
  
  <pre><code>myremote@mylive-website:~/mylive$ git stash
  Saved working directory and index state WIP on master: 9728f63 Merge branch 'master' of bitbucket.org:myname/my-repo-name
  HEAD is now at 9728f63 Merge branch 'master' of bitbucket.org:myname/my-repo-name
  myremote@mylive-website:~/mylive$ git rev-parse HEAD
  1cb3966b518e0e31940407d53b981bbb58a62092
  myremote@mylive-website:~/mylive$ git merge master
  Already up-to-date.
  </code></pre>
  
  <p>So my local and live-server have different commit number. How can I fix this?</p>