jxk@sh.itjust.works to Programmer Humor@programming.dev · 11 hours agoPlease let me squash a merge commitsh.itjust.worksimagemessage-square24fedilinkarrow-up1306arrow-down12
arrow-up1304arrow-down1imagePlease let me squash a merge commitsh.itjust.worksjxk@sh.itjust.works to Programmer Humor@programming.dev · 11 hours agomessage-square24fedilink
minus-squareElvith Ma'for@feddit.orglinkfedilinkarrow-up13·8 hours agoThat’s basically my commit history for every repo where I need the pipeline to run to see if everything works.
minus-squareranzispa@mander.xyzlinkfedilinkarrow-up1·4 hours agoWhen I do that I always have a Dev branch that I use as the production branch to run the actual calculations. When I get something working I merge it off, clean up the history a little bit, rebase main onto it and then rebase de onto main.
minus-squarekungen@feddit.nulinkfedilinkarrow-up4·7 hours agoHaha same. But that’s why you do it in another branch, and then squash-merge.
minus-squareranzispa@mander.xyzlinkfedilinkarrow-up1·4 hours agoI like squash merge on small changes, but when larger code changes are there it becomes a huge commit which is difficult to review if you ever have to go back.
minus-squarepsycotica0@lemmy.calinkfedilinkarrow-up1·4 hours agoRight… for sure… but then if you don’t want to squash, then it doesn’t matter you can’t squash a merge commit.
That’s basically my commit history for every repo where I need the pipeline to run to see if everything works.
When I do that I always have a Dev branch that I use as the production branch to run the actual calculations.
When I get something working I merge it off, clean up the history a little bit, rebase main onto it and then rebase de onto main.
Haha same. But that’s why you do it in another branch, and then squash-merge.
I like squash merge on small changes, but when larger code changes are there it becomes a huge commit which is difficult to review if you ever have to go back.
Right… for sure… but then if you don’t want to squash, then it doesn’t matter you can’t squash a merge commit.