I usually squash my local into a single commit, then rebase it onto the head of main. Tends to be simpler