From: Alex Coppens <alex@nativetouch.com>
Date: Thu, 14 May 2015 18:05:55 GMT
Subject: Problem with rerere forget
Message-ID: <CAPt1q6fMMz61aZEJB9b+K6+kHFwkm+bMYXoKBj78GNJU+dWioA@mail.gmail.com>

Hello there,

So I am trying to make git forget a conflict resolution:
_______________


git rerere forget path_to_file/file.js

fatal: BUG: attempt to commit unlocked object

_______________

Google doesn't seem to know the answer: No results found for "fatal:
BUG: attempt to commit unlocked object".


I think I am using rerere forget the wrong way. Can someone help?

Regards,

Alex