Re: The git spring cleanup challenge

Felipe Contreras [off-list ref] writes:

Junio C Hamano wrote:

quoted

David Aguilar [off-list ref] writes:

quoted

+1 for merge.conflictstyle = diff3, rerere.enabled = true, and
log.decorate = short from me. I noticed others already mentioned
these.

As the inventor of rerere, I agree on rerere.enabled.  It was made
opt-in only because I thought it was somewhat risky when the feature
was introduced, but it has been stable and useful, and it is long
overdue to be enabled by default.

Agreed.

I personally would like some interface to see what's going on behind the
scenes because sometimes I've made a wrong resolution that gets carried
around and I don't know of a way to clear them (other than manually
hunting down the cached files).

I'm second here. Wanted to get rid of some recorded resolutions, but
didn't find a suitable way to.

Thanks,
-- Sergey Organov.

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).