On Sun, Jun 01, 2025 at 12:48:21PM -0700, Xiyue Deng wrote:
There may be better ways to handle this, but I usually handle this situation this way: assuming the patches can apply to the previous packaged version of the package, I would go back to that version (may be by a "git reset --hard"), and run "gbp pq import" there. This should import the patches to gbp-pq just fine. Then import the newer version as usual, and "gbp pq rebase" should let you revise the patch conflicts like a usual git rebase.
That's like my suggestion but doing it manually. -- WBR, wRAR
Attachment:
signature.asc
Description: PGP signature