In my opinion, you should create a new branch with the same root, and then use cherry-pick to add every commit you made, except for those that are not accepted by the author.
Then send a pull request on this branch.
In addition, if you want to regroup all your modifications into one simple fixer, you can use reba squash in the local branch before clicking it online.
source share