title: Using Git to update production server
body: <p>Our team has recently migrated to git. </p>
  
  <p>We have production web application server with some small changes to code</p>
  
  <ul>
  <li>ultra hot hotfixes specific to this installaton</li>
  <li>some debugging statements for those bugs that can't reproduced in our testing enviroment</li>
  </ul>
  
  <p>I think, we can't commit those in server repo.</p>
  
  <p>When we had <code>svn update</code> either merged changed file or not merged. Now</p>
  
  <pre><code> git stash; git pull; git stash pop
  </code></pre>
  
  <p>does the trick for me</p>
  
  <p>How can I automatically detect those cases when <code>git stash pop</code> will cause conflicts</p>
  
  <p>making production working copy broken? </p>
  
  <p>I want send mail to resolve these cases manually</p>
  
  <p><strong>before</strong> they occur like <code>be advised, pull cancelled (conflicts)</code></p>