I really thought my boss setup rerere on my project a while ago. I had a merge without conflicts that went wrong (the whole app breaking because of a missing comma) so I assumed a conflict was automatically resolved. Alex On Thu, May 14, 2015 at 4:56 PM, Jeff King <peff@xxxxxxxx> wrote: > On Thu, May 14, 2015 at 04:51:25PM -0400, Alex Coppens wrote: > >> Here are the outputs I have: >> >> $ ls -d .git/rr-cache >> ls: .git/rr-cache: No such file or directory >> >> $ git config rerere.enabled >> $ >> >> My repository is a ruby on rails project, I am currently on the >> development branch. It's a private repository hosted on Github. Not >> sure what other information you want. > > OK, so it looks like rerere is not enabled (and my patch will fix the > case you saw). But then I am puzzled why you were running "rerere > forget" in the first place. Just experimenting, or did you expect it to > do something? > > -Peff -- 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