Thread (2 messages) flat view 2 messages, 2 authors, 2021-06-03

Re: The git spring cleanup challenge

From: Junio C Hamano <hidden>
Date: 2021-06-03 03:00:27

Sergey Organov [off-list ref] 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).
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help