New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26642#issuecomment-732401680

Comment:
`git rebase upstream/master` should do it