title: How to record git merge conflicts and their resolutions but without automatically resolving conflicts?
body: <p>I know that there is a feature that git has called rerere which stands for "reuse recorded resolution".
  This feature (if enabled) records the conflicts and their resolutions. That's great.
  But this feature also automatically resolves conflicts. That is a huge problem for us since we don't want automatic conflict resolution. 
  Is there a way to use rerere to record the conflicts and their resolutions but NOT perform automatic resolutions? 
  If not, is there a different way this could be done? Perhaps there is a GitHub plugin for this? (we use GitHub and I couldn't find such a plugin).
  Thanks.</p>