jxk@sh.itjust.works to Programmer Humor@programming.dev · 1 month agoPlease let me squash a merge commitsh.itjust.worksimagemessage-square50fedilinkarrow-up1500arrow-down13
arrow-up1497arrow-down1imagePlease let me squash a merge commitsh.itjust.worksjxk@sh.itjust.works to Programmer Humor@programming.dev · 1 month agomessage-square50fedilink
minus-squareMiaou@jlai.lulinkfedilinkarrow-up1·1 month agoI often end up squashing all my changes into a single commit, rebase it, and then reset HEAD^ to rewrite some commit history. Brute force, but better than resolving 10 conflicts in the same file over and over
I often end up squashing all my changes into a single commit, rebase it, and then reset HEAD^ to rewrite some commit history.
Brute force, but better than resolving 10 conflicts in the same file over and over