N3Cr0@lemmy.world to Programmer Humor@lemmy.ml · 4 months agoIt happens each time!lemmy.worldexternal-linkmessage-square55fedilinkarrow-up1547arrow-down116
arrow-up1531arrow-down1external-linkIt happens each time!lemmy.worldN3Cr0@lemmy.world to Programmer Humor@lemmy.ml · 4 months agomessage-square55fedilink
minus-squarezalgotext@sh.itjust.workslinkfedilinkarrow-up1·4 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
rerereapplies 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.