@JPDev to Programmer Humor • 3 months agoRebase Supremacyimagemessage-square238arrow-up11.14Karrow-down122
arrow-up11.11Karrow-down1imageRebase Supremacy@JPDev to Programmer Humor • 3 months agomessage-square238
minus-square@[email protected]linkfedilink7•3 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@exprlink4•3 months agoNope, you just need to do it once: https://git-scm.com/book/en/v2/Git-Tools-Rerere.
minus-square@[email protected]linkfedilink2•3 months agoDoesn’t this defeat the purpose, may as well merge then no?
minus-square@[email protected]linkfedilink1•3 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.