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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html