@[email protected] to Programmer [email protected] • 1 year agoRebase Supremacyprogramming.devimagemessage-square232fedilinkarrow-up11.13K
arrow-up11.13KimageRebase Supremacyprogramming.dev@[email protected] to Programmer [email protected] • 1 year agomessage-square232fedilink
minus-square@[email protected]linkfedilink9•1 year 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@[email protected]linkfedilink2•1 year agoDoesn’t this defeat the purpose, may as well merge then no?
minus-square@[email protected]linkfedilink1•1 year 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.
minus-square@[email protected]linkfedilink4•1 year agoNope, you just need to do it once: https://git-scm.com/book/en/v2/Git-Tools-Rerere.
Well, rebase allows you to resolve the same conflict ten times in a row instead of doing it once. How cool is that?
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.
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?