New comment by ahesford on void-packages repository https://github.com/void-linux/void-packages/pull/21209#issuecomment-617408559 Comment: Note that I have successfully rebased this branch several times. There are no conflicts locally, so I'm not sure why Github reports conflicts here. I believe this to be an artifact of the Github issue earlier today.