New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/35075#issuecomment-1030680072 Comment: You never want to use merge for void-packages. Use `git rebase` and `git pull --rebase` instead.