title: How do I blow away my attempt to resolve git conflicts
body: <p>I checked out 'production_branch' then did a merge of 'master_branch for_production_branch' there were massive conflicts.  'production_branch' has been deployed to production.  But the conflicts require a more experienced eye.  I need to get a critical patch (I will do it by hand) onto the production branch 'production_branch' so I can deploy.</p>
  
  <pre><code>git co 'production_branch'  # =&gt; 
  lib/tasks/foobar.rake: needs merge
  vendor/plugins/acts_as_syncable/lib/active_record/whatever.rb: needs merge
  error: you need to resolve your current index first
  </code></pre>
  
  <p>and</p>
  
  <pre><code>git co 'master_branch for_production_branch'
  lib/tasks/foobar.rake: needs merge
  vendor/plugins/acts_as_syncable/lib/active_record/whatever.rb: needs merge
  error: you need to resolve your current index first
  </code></pre>
  
  <p>How can I get back to 'production_branch' in my working directory so I can deploy a simple critical fix.</p>