ericheese@lemmy.zip to Programmer Humor@lemmy.ml · 12 days agoWhen you screw up gitlemmy.mlimagemessage-square7linkfedilinkarrow-up128arrow-down10
arrow-up128arrow-down1imageWhen you screw up gitlemmy.mlericheese@lemmy.zip to Programmer Humor@lemmy.ml · 12 days agomessage-square7linkfedilink
minus-squarechaospatterns@lemmy.worldlinkfedilinkEnglisharrow-up2·12 days agoRebase still means you have to resolve conflicts, but it can be worse because you may have to resolve conflicts across multiple commits that you’re rebasing on top of a conflict.
Use a rebase.
Rebase still means you have to resolve conflicts, but it can be worse because you may have to resolve conflicts across multiple commits that you’re rebasing on top of a conflict.