New comment by catdevnull on void-packages repository

https://github.com/void-linux/void-packages/pull/35466#issuecomment-1047259294

Comment:
It seems you got merge commits still. Try this:

```
# Fetch latest changes from upstream
git fetch upstream
# Reset branch to upstream
git reset --hard upstream/master
# Add the upgrade commit on top
git cherry-pick 1512578282a22c0c82d32964c117e7f7a82a50e0
# Force push
git push --force
```

Also, you still haven't replaced the hardcoded version in distfiles. After the previous commands, you could do this:
```
# Do the changes with your favourite editor
# Add the changes to the last commit ("amending")
git commit srcpkgs/gitea/template --amend
# Force push
git push --force
```