When hoff fails to rebase a PR, it'll leave a comment with the rebase command one should use locally for reproducing the rebase and solving the conflicts like this:

git rebase --interactive --autosquash origin/master my-feature-branch

However, if you're just blindly following the instructions, you might not actually reproduce the issue hoff encountered because your local view of origin/master might still be outdated.

For convenience, we could just include a git fetch in that line like this:

git fetch && git rebase --interactive --autosquash origin/master my-feature-branch