@jpmens
I tend to just configure my git remotes to not accept pushes to the main branch, only merges. After that it's just a matter of simple git history editing.