RE:git-dpm vs gbp-pq: new upstream and patch refresh (long)

[PICCA Frederic-Emmanuel <frederic-emmanuel.picca@synchrotron-soleil.fr>]

> > The file is patched, but now I have an d/p/0005- file instead of a
> > modified
> > 0003- patch file.  Sigh.

In this case you can use

git rebase -i master

edit the commit to merge 0003- and 0005-


Cheers

Frederic