Take two after several months. That is what you get when you end up running a busy project, instead of staying to be an individual contributor ;-). The previous round starts at the message this is a response to and is found at http://thread.gmane.org/gmane.comp.version-control.git/277878 The previous round completed the basic "record and replay", while leaving "gc" and "forget" as known-to-be-stale bits. This round attempts to complete them. Junio C Hamano (11): rerere: split conflict ID further rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id rerere: handle leftover rr-cache/$ID directory and postimage files rerere: delay the recording of preimage rerere: allow multiple variants to exist t4200: rerere a merge with two identical conflicts rerere: do use multiple variants rerere: gc and clear rerere: move code related to "forget" together rerere: split code to call ll_merge() further rerere: adjust 'forget' to multi-variant world order rerere.c | 626 +++++++++++++++++++++++++++++++++++++----------------- rerere.h | 4 +- t/t4200-rerere.sh | 159 +++++++++++++- 3 files changed, 593 insertions(+), 196 deletions(-) -- 2.8.0-215-g046a488 -- 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