On Wed, 02 Aug 2017 21:13:16 +0200, Hilko Bengen wrote: > > [...] > > sepia > > Hilko Bengen > > My local branch branch up to tag debian/0.992-6 and the master branch on > git.debian.org have diverged by 3 commits each. What should I do? I see that you've pushed the tag in the meantime; thanks for that! If there's still outstanding cleanup to do, I'd try `git pull --rebase' but a merge commit is also no problem; just a force push onto a published repo should be avoided. Cheers, gregor -- .''`. https://info.comodo.priv.at/ - Debian Developer https://www.debian.org : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D 85FA BB3A 6801 8649 AA06 `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `-
Attachment:
signature.asc
Description: Digital Signature