On 13 March 2010 10:43, Chris Packham <judge.packham@xxxxxxxxx> wrote: > On Fri, Mar 12, 2010 at 3:07 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: >> (3) If you have rerere enabled, then the conflicts would be already >> resolved in your working tree at this point, but not in the index, so >> you can reproduce the conflicted state with "checkout -m". > > Mental note: Need to learn more about git rerere. Sounds like what I > need to do the job. > There is a script in the contrib directory written by Nanako Shiraishi called rerere-train.sh which can be used to prime the rr-cache even if you didn't have rerere enabled before you orginally did the merge. -- 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