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.

[–] psycotica0@lemmy.ca 1 points 2 weeks ago

Right... for sure... but then if you don't want to squash, then it doesn't matter you can't squash a merge commit.

[–] firelizzard@programming.dev 1 points 1 week ago

If the squash merge is too big to review then that change should have been broken up into multiple separate changes. Regardless whether you’re using pull requests or some equivalent or directly merging feature branches, if “one unit of work” is too much to review when squashed, then your unit of work is too big and needs to be split up. A unit of work should always be reviewable as a whole.

[–] ranzispa@mander.xyz 1 points 2 weeks ago

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.