Update

Create update new issue

gbp import-orig --filter='debian/*' ~/Downloads/rivendell-x.y.z.tar.gz
gbp pq rebase

in case of conflict, fix it, then

git add path/to/file
git rebase --continue # and not commit !
git checkout master
gbp pq export
gc -m "Refresh all debian patches. Refs #NNN" -a
dch --newversion=x.y.z-1 --distribution unstable 'New upstream release'
gc -m "Update release to x.y.z-1. Refs #NNN" -a
git push --tags
git push