jxk@sh.itjust.works to Programmer Humor@programming.dev · 3 days agoPlease let me squash a merge commitsh.itjust.worksimagemessage-square45linkfedilinkarrow-up1511arrow-down14
arrow-up1507arrow-down1imagePlease let me squash a merge commitsh.itjust.worksjxk@sh.itjust.works to Programmer Humor@programming.dev · 3 days agomessage-square45linkfedilink
minus-squareranzispa@mander.xyzlinkfedilinkarrow-up1·3 days 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.
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.