JPDev@programming.dev to Programmer Humor@programming.dev · 11 months agoRebase Supremacyprogramming.devimagemessage-square207fedilinkarrow-up11.11Karrow-down122
arrow-up11.09Karrow-down1imageRebase Supremacyprogramming.devJPDev@programming.dev to Programmer Humor@programming.dev · 11 months agomessage-square207fedilink
minus-squarecobra89@beehaw.orglinkfedilinkarrow-up1·11 months agoOkay honest question, when you merge a PR in GitHub and choose the squash commits box is that “rebasing”? Or is that just squashing? Because it seems that achieves the same thing you’re talking about.
minus-squarejjjalljs@ttrpg.networklinkfedilinkarrow-up3·11 months agoThere’s two options in the green button on a pr. One is squash and merge, the other is squash and rebase. Squashing makes one commit out of many. You should IMO always do this when putting your work on a shared branch Rebase takes your commit(s) and sticks them on the end. Merge does something else I don’t understand as well, and makes a merge commit. Also there was an earthquake in NYC when I was writing this. We may have angered the gods.
minus-squarecobra89@beehaw.orglinkfedilinkarrow-up1·11 months agoLmao I’m in the NYC area and my whole house shook. I’m right there with you. Thanks for the explanation!
Okay honest question, when you merge a PR in GitHub and choose the squash commits box is that “rebasing”? Or is that just squashing? Because it seems that achieves the same thing you’re talking about.
There’s two options in the green button on a pr. One is squash and merge, the other is squash and rebase.
Squashing makes one commit out of many. You should IMO always do this when putting your work on a shared branch
Rebase takes your commit(s) and sticks them on the end.
Merge does something else I don’t understand as well, and makes a merge commit.
Also there was an earthquake in NYC when I was writing this. We may have angered the gods.
Lmao I’m in the NYC area and my whole house shook. I’m right there with you. Thanks for the explanation!