Gentoo Archives: gentoo-dev

From:	"Michał Górny" <mgorny@g.o>
To:	"Andreas K. Huettel" <dilfridge@g.o>
Cc:	gentoo-dev@l.g.o
Subject:	Re: [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: /
Date:	Sat, 10 Oct 2015 11:41:48
Message-Id:	`20151010134121.332c72a7.mgorny@gentoo.org`
In Reply to:	[gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: / by "Andreas K. Huettel"

1	Dnia 2015-10-10, o godz. 13:33:03
2	"Andreas K. Huettel" <dilfridge@g.o> napisał(a):
3
4	> -----BEGIN PGP SIGNED MESSAGE-----
5	> Hash: SHA512
6	>
7	> >
8	> > You should (almost) never commit reverse-merges of git.gentoo.org
9	> > master[0].
10	> >
11	> > Instead, you have to use
12	> > git pull --rebase=preserve origin master
13	> >
14	> > in case you get "push conflicts" [1]
15	> >
16	>
17	> Which I tried several times, but git steadfast refused to sign the commit
18	> properly. Maybe a new bug somewhere?
19
20	Seen that. Can be worked around via:
21
22	git pull --rebase=preserve -S<keyid> ...
23
24	But usually when people see bugs, they report them instead of using
25	them as an excuse to break the policy.
26
27	--
28	Best regards,
29	Michał Górny
30	<http://dev.gentoo.org/~mgorny/>