Help with new package version?

[Benjamin Redelings <benjamin.redelings@gmail.com>]

Hi,

I've released a new version 3.0.3 of bali-phy, and I realize that I 
don't understand how to manage the salsa repo using git.  I've tried 
something like this (mostly locally), but I'm pretty sure there is a way 
of doing this with gbp that is recommended instead:

    git fetch upstream
    git fetch upstream --tags
    git checkout upstream
    git merge -X theirs 3.0.3
    git tag upstream/3.0.3+dfsg
    git checkout master
    git merge upstream

I also tried gbp dch, but it tried to create version 3.0.2+dfsg-2 
instead of 3.0.3+dfsg-1.  Would it be possible to give me the quick 
overview?  My apologies for the basic nature of this question.

-BenRI