@JPDev@programming.dev to Programmer Humor@programming.dev • 8 months agoRebase Supremacyprogramming.devimagemessage-square230fedilinkarrow-up11.13K
arrow-up11.13KimageRebase Supremacyprogramming.dev@JPDev@programming.dev to Programmer Humor@programming.dev • 8 months agomessage-square230fedilink
minus-square@Aux@lemmy.worldlinkfedilink9•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-square@expr@programming.devlinkfedilink4•8 months agoNope, you just need to do it once: https://git-scm.com/book/en/v2/Git-Tools-Rerere.
minus-square@rapist1@lemmy.worldlinkfedilink2•8 months agoDoesn’t this defeat the purpose, may as well merge then no?
minus-square@jjjalljs@ttrpg.networklinkfedilink1•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.