jxk@sh.itjust.works to Programmer Humor@programming.dev · 10 days agoPlease let me squash a merge commitsh.itjust.worksimagemessage-square50linkfedilinkarrow-up1528arrow-down14
arrow-up1524arrow-down1imagePlease let me squash a merge commitsh.itjust.worksjxk@sh.itjust.works to Programmer Humor@programming.dev · 10 days agomessage-square50linkfedilink
minus-squareMiaou@jlai.lulinkfedilinkarrow-up1·9 days 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