JPDev@programming.dev to Programmer Humor@programming.dev · 8 months agoRebase Supremacyprogramming.devimagemessage-square231fedilinkarrow-up11.12Karrow-down122
arrow-up11.1Karrow-down1imageRebase Supremacyprogramming.devJPDev@programming.dev to Programmer Humor@programming.dev · 8 months agomessage-square231fedilink
minus-squareAux@lemmy.worldlinkfedilinkarrow-up9arrow-down2·8 months agoWell, rebase allows you to resolve the same conflict ten times in a row instead of doing it once. How cool is that?
minus-squareexpr@programming.devlinkfedilinkarrow-up4·8 months agoNope, you just need to do it once: https://git-scm.com/book/en/v2/Git-Tools-Rerere.
minus-squarejjjalljs@ttrpg.networklinkfedilinkarrow-up1arrow-down1·8 months agoSquash your branch first
minus-squarerapist1@lemmy.worldlinkfedilinkarrow-up2·8 months agoDoesn’t this defeat the purpose, may as well merge then no?
minus-squarejjjalljs@ttrpg.networklinkfedilinkarrow-up1·8 months agoDo not merge your unfinished stuff into main. I don’t like merging main into my branch because I don’t understand git, and I feel like that can make a confusing history.
Well, rebase allows you to resolve the same conflict ten times in a row instead of doing it once. How cool is that?
Nope, you just need to do it once: https://git-scm.com/book/en/v2/Git-Tools-Rerere.
Why would I ruin all the fun?
Squash your branch first
Doesn’t this defeat the purpose, may as well merge then no?
Do not merge your unfinished stuff into main.
I don’t like merging main into my branch because I don’t understand git, and I feel like that can make a confusing history.