Dnia 2015-10-10, o godz. 13:33:03 "Andreas K. Huettel" <dilfri...@gentoo.org> napisał(a):
> -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA512 > > > > > You should (almost) never commit reverse-merges of git.gentoo.org > > master[0]. > > > > Instead, you have to use > > git pull --rebase=preserve origin master > > > > in case you get "push conflicts" [1] > > > > Which I tried several times, but git steadfast refused to sign the commit > properly. Maybe a new bug somewhere? Seen that. Can be worked around via: git pull --rebase=preserve -S<keyid> ... But usually when people see bugs, they report them instead of using them as an excuse to break the policy. -- Best regards, Michał Górny <http://dev.gentoo.org/~mgorny/>
pgpGqR956dTWm.pgp
Description: OpenPGP digital signature
