Sergey Organov <sorganov@xxxxxxxxx> writes: > I'm second here. Wanted to get rid of some recorded resolutions, but > didn't find a suitable way to. J6t gave a good summary on a side thread. "rerere forget" followed by "checkout -m" is your friend (alternatively you can redo the operation that applied a "wrong" resolution after doing the "rerere forget" step, of course).
