New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32150#issuecomment-886208448

Comment:
@gtryujb `git pull --rebase --autostash upstream master` is the correct command to remove the merge branch commit