Do a merge / sync

grab the automated merge results grab-merge python-mistralclient && cd python-mistralclient
download ubuntu package source git clone lp:~ubuntu-server-dev/ubuntu/+source/python-mistralclient
untar debian dir from LATEST debian package tar xvf python-mistralclient_4.0.1-2.debian.tar.xz
copy merged debian dir to our package source rsync -avrz --delete ../python-mistralclient-4.0.1-2ubuntu1/debian/ ./python-mistralclient/debian/
read the REPORT file (note the Conflicts) vi REPORTS ( in this case don't worry about any that aren't in debian dir )
resolve the Conflict files cd python-mistralclient (fix up conflicting files, you'll see conflicts surrounded by <<<<<<< ======= >>>>>>>)
update d/changelog with your name/email/stamp dch -i # you'll need to maintain the old version; not sure of a better way
compare latest debian and new ubuntu package diff -Naur ../debian/ debian/|less
note any differences* in "Remaining changes" vi debian/changelog
verify git diff changes make sense git diff
commit changes debcommit -a # only keep "Merge from Debian unstable. Remaining changes:" paragraph in commit message
push to launchpad git push lp:~ubuntu-server-dev/ubuntu/+source/python-mistralclient
create new upstream release if needed