jxk@sh.itjust.works to Programmer Humor@programming.dev · 1 day agoPlease let me squash a merge commitsh.itjust.worksimagemessage-square41linkfedilinkarrow-up1471arrow-down14
arrow-up1467arrow-down1imagePlease let me squash a merge commitsh.itjust.worksjxk@sh.itjust.works to Programmer Humor@programming.dev · 1 day agomessage-square41linkfedilink
minus-squareMiaoulinkfedilinkarrow-up1·12 hours 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