New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/30939#issuecomment-847337060

Comment:
I will go with `git rebase --interactive HEAD~10` then drop all the relevant commits (except the 1st one).

Then `git pull upstream master --rebase`.

And finally adding your changes to the template (again), then `git commit --amend`, `git push -f`