title: How to pull from github to server (Your branch is ahead of 'origin/master' by 11 commits.)
body: <p>I uses github to transfer files from local to server. I just uses </p>
  
  <pre><code>git pull origin master 
  </code></pre>
  
  <p>on server to pull from github but now I have made some changes on files on server (edited few/deleted few as well as few are untracked now). </p>
  
  <p>Now I have pushed the latest working code from local to github and I was thinking of just doing <strong>git pull origin master</strong>. Is this the right way to do it ? will it take care of all the conflicts and the message that I am getting - "Your branch is ahead of 'origin/master' by 11 commits" ?</p>
  
  <p>I am just worried that git pull origin master don't create multiple merge files as the server is live! </p>