title: Git push origin works, but server is not updating
body: <p>I have a git with two remotes, let's say primary and secondary. My workflow usually goes like this:</p>
  
  <p>For remote primary:</p>
  
  <ol>
  <li>Push changes to remote primary from directory A,</li>
  <li>Pull changes from remote secondary to directory A (if any),</li>
  <li>Change necessary files,</li>
  <li>Push changes to both remote primary and secondary.</li>
  </ol>
  
  <p>And just a normal git pull - change - git push in the secondary remote.</p>
  
  <p>Recently when I do git push on remote primary I always got an error that says: <code>Your local changes to the following files would be overwritten by merge</code>. Even so, the git push went on, and if I check with git status it says everything is up to date. So I thought it is good.</p>
  
  <p>However when I look at the website, it seems like it is not using the latest code I pushed. I have tried to change and push the files related to the error; checkout the commit related to the error and push changes on it; but no result so far.</p>
  
  <p>Any thought on how should I fix this?</p>
  
  <p>Thank you.</p>