> I do believe this bug may actually be fixed in master, by 93406a282f
> ("rerere: fix crash with files rerere can't handle", 2018-08-05). Do
> you by any chance remember if you committed a file that contained
> conflict markers during the rebase at some point?
I might have, but I am not 100% sur
bug; after removing
.git/MERGE_RR.lock and restarting the rebase, it completed fine.
Please let me know if there is anything I can do to help diagnose the
problem, or whether I should report the bug to Ubuntu instead.
Kind regards,
Ruud van Asseldonk
2 matches
Mail list logo
