@[email protected] to Programmer [email protected] • 9 months agoRebase Supremacyprogramming.devimagemessage-square216fedilinkarrow-up11.11Karrow-down120
arrow-up11.09Karrow-down1imageRebase Supremacyprogramming.dev@[email protected] to Programmer [email protected] • 9 months agomessage-square216fedilink
minus-square@Auxlink7•9 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@[email protected]linkfedilink4•9 months agoNope, you just need to do it once: https://git-scm.com/book/en/v2/Git-Tools-Rerere.
minus-square@[email protected]linkfedilink1•9 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.