git checkout master git branch main master -f git checkout main git push origin main -f # Note that this code forces them to merge. Also got this from Stack Overflow # and found it was incredibly useful for me.