jxk@sh.itjust.works to Programmer Humor@programming.dev · 7 months agoPlease let me squash a merge commitsh.itjust.worksimagemessage-square47linkfedilinkarrow-up1523arrow-down10
arrow-up1523arrow-down1imagePlease let me squash a merge commitsh.itjust.worksjxk@sh.itjust.works to Programmer Humor@programming.dev · 7 months agomessage-square47linkfedilink
minus-squareranzispa@mander.xyzlinkfedilinkarrow-up1·7 months 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.