New comment by hsnfirdaus on void-packages repository https://github.com/void-linux/void-packages/pull/38942#issuecomment-1329087330 Comment: > You don't have to update your master branch for this. Just simply running `git pull --rebase upstream master` on this branch would be enough. You will probably get a conflict about qt6-3d which you will have to remove because it shouldn't be in this PR. ![image](https://user-images.githubusercontent.com/38871578/204288640-22b97916-7e44-43ea-997f-15a9a4b527a9.png) Well, i still get that conflict message, when i try to skip another commit make this conflict again...