There's a lot of commit history here that we're not going to want. It looks like all your most recent updates are in the last commit? If that's the case, I think you can do the following:
checkout back to main
Pull the most recent version of the upstream main (git pull --recurse-submodules upstream main)
Create a new branch just for these changes (git checkout -b <new-branch-name>)
Apply this commit to that new branch (git cherry-pick 589b39f). That number after cherry-pick is the commit hash of your most recent commit. I've never actually used cherry-pick before; I think it'll work, but let me know if it doesn't.
Push that new branch to your remote repo (git push origin <new-branch-name>) and make a new PR
Close this PR
Let me know if you have questions about any of this.
There's a lot of commit history here that we're not going to want. It looks like all your most recent updates are in the last commit? If that's the case, I think you can do the following:
checkoutback tomaingit pull --recurse-submodules upstream main)git checkout -b <new-branch-name>)git cherry-pick 589b39f). That number aftercherry-pickis the commit hash of your most recent commit. I've never actually usedcherry-pickbefore; I think it'll work, but let me know if it doesn't.git push origin <new-branch-name>) and make a new PRLet me know if you have questions about any of this.