#git bot interface

History of !unresolve

• Accidentally marked a conflicted file as resolved and want to get the conflict markers back? `git checkout --merge -- <path to file(s)>`
  By osse at 2014-05-06 12:31:47
• Accidentally marked a conflicted file as resolved and want to get the conflict markers back? `git update-index --unresolve -- <path to file(s)>`
  By Nevik at 2013-05-27 06:23:55