New comment by wael444 on void-packages repository

https://github.com/void-linux/void-packages/pull/36508#issuecomment-1138636306

Comment:
> rebase your branch on top of master
```
... <thousands upon thousands of merge conflicts>
CONFLICT (add/add): Merge conflict in xbps-src
error: could not apply cf536a16a3... jp2a: update to 1.1.1
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
```