New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/26088#issuecomment-724754073

Comment:
Looks like you need to rebase on master, there's been a few updates to the package before yours.

     git remote add upstream git@github.com:void-linux/void-packages
     git pull upstream master --rebase --autostash

It'll complain of a conflict, edit `srcpkgs/adobe-flash-plugin/template` to be correct, then `git add srcpkgs/adobe-flash-plugin/template` and finish the rebase.

    git rebase --continue

Then you can repush.