Fix My PR

Or "How to Update a Feature Branch From main and Still End Up With a Single Commit PR". If your repository expects exactly one commit in each pull request, you need to be a bit careful when...