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.