New comment by kawaiiamber on void-packages repository

https://github.com/void-linux/void-packages/pull/27737#issuecomment-761189898

Comment:
Whoa, it looks like you pulled all changes from latest upstream. Add upstream as a remote, make sure you're on your branch, then rebase:
```sh
git remote add upstream https://github.com/void-linux/void-packages.git
git pull --rebase upstream master
git push origin master -f
```
It's generally a good practice to have a different branch for your PR, especially if you want to do multiple PRs. I would make a branch for your package that you want specifically.
```
git checkout -b hamster
```
Edit your template in srcpkgs/\<pkg\>/template, then push one commit to that branch.
```
git add -A
git commit -m "New package: xcfe4-hamster-plugin-1.8"
git push origin hamster
```
Then, on this PR, switch the branch from your master branch to your hamster branch to be merged with upstream master. Squash any future commits with `amend`:
```
git add -A
git commit --amend
git push origin hamster -f
```