On Sat, Aug 22, 2020 at 01:08:52AM +0200, Hilmar Preuße wrote: > gbp:error: Error running git push: To > salsa.debian.org:debian-proftpd-team/proftpd-mod-case.git > ! [rejected] d8074c6b03512b4001b8e1ea06737afd989f139a -> master > (non-fast-forward) > > I did the "git pull", which says "Already up to date.", but this did not > solve the issue. How do I solve the issue? The answer is always "look at the git commit tree and understand what's happening there". And we cannot do that for you as it exists only on your machine. It's clear that the branches diverged but when, why, how and what to do now can only be understood by looking at the tree. > One note: when I tried to do the push for the first time it told me > there would be no "upstream/0.7+git73896501cf" tag, which was correct. > The person who did the upload for debian/0.7+git73896501cf-1 did not > update the "upstream" branch, hence the tag was not created. I fixed the > upstream branch by doing an "gpb import-orig". Now the > "upstream/0.7+git73896501cf" tags is more recent than the > "debian/0.7+git73896501cf-2" tag. Could this cause issues? The tag creation dates are irrelevant. In the gbp workflow the merge order is not relevant either as long as the upstream tag content is correct. -- WBR, wRAR
Attachment:
signature.asc
Description: PGP signature