New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26224#issuecomment-723643010

Comment:
You need to rebase your branch on `upstream/master`; don't use merge.