• zalgotext@sh.itjust.works
    link
    fedilink
    arrow-up
    1
    ·
    3 months ago

    I don’t think rerere applies here. Once you do a rebase, the rewritten commits should contain the conflict resolutions. The only way conflicts could reoccur on subsequent rebases is if changes reoccur in those same files/lines.