New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/29039#issuecomment-785393406

Comment:
Don't do `git merge` :) Do `git pull --rebase` from upstream branch instead