Due to me trying to tidy up my commits – I learned a hard lesson to not rewrite commit history…if you have any local changes, set them aside and just reclone upstream and then force-push to your local fork. It’s the easiest and cleanest way to resolve this. Your branches have very likely diverged.
I promise to not make any more messes but wanted to give a heads up.
My apologies for having to publicly uhm, post this.