Continuing on a squash merged branch is very annoying, and I had to deal with this in one repo regularly... Luckily I was annoyed enough to research about this and found out about rebase --onto "main merge commit" "branch merged commit".