New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/42800#issuecomment-1472675358

Comment:
if you made the second commit on github, `git pull`

then `git rebase -i master`. this will open an editor. on the line with the second commit, change `pick` to `f -C` so it squashes it into the first commit, but only keeps the commit message of the second. then save & close the file

if it succeeds and looks right in `git log` and `git show`, `git push --force`