title: git + deploy to production
body: <p>I'm fairly new to git and was wondering best practices when deploying to production? I have a master branch which always has the latest version of the code for production. When I goto production (for now I do it manually), I type <code>git pull</code> and get the latest. But it tries to <strong>merge</strong> the code, and sometimes it creates conflicts, etc. Is there a way for it to force it to take whatever is in the master branch as is?</p>
  
  <p>I tried reading much on this including:</p>
  
  <p><a href="https://stackoverflow.com/questions/3853194/best-solutions-to-deploy-from-git-to-production">Best solutions to deploy from git to production?</a></p>
  
  <p><a href="http://posheika.net/?p=136" rel="nofollow noreferrer">http://posheika.net/?p=136</a></p>