In a git world, aren't you *supposed* to merge [1] your upstream into your feature branch before you you make a PR?
(in a more centralized environment, I am still responsible for pushing only completely resolved merges)
[1] or rebase, depending on the project's culture, your sensibilities, how...