N3Cr0@lemmy.world to Programmer Humor@lemmy.ml · 7 months agoIt happens each time!lemmy.worldimagemessage-square54fedilinkarrow-up1545arrow-down116
arrow-up1529arrow-down1imageIt happens each time!lemmy.worldN3Cr0@lemmy.world to Programmer Humor@lemmy.ml · 7 months agomessage-square54fedilink
minus-squarezalgotextlinkfedilinkarrow-up1·7 months agoI 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.
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.