1 |
-----BEGIN PGP SIGNED MESSAGE----- |
2 |
Hash: SHA512 |
3 |
|
4 |
> |
5 |
> You should (almost) never commit reverse-merges of git.gentoo.org |
6 |
> master[0]. |
7 |
> |
8 |
> Instead, you have to use |
9 |
> git pull --rebase=preserve origin master |
10 |
> |
11 |
> in case you get "push conflicts" [1] |
12 |
> |
13 |
|
14 |
Which I tried several times, but git steadfast refused to sign the commit |
15 |
properly. Maybe a new bug somewhere? |
16 |
|
17 |
- -- |
18 |
Andreas K. Huettel |
19 |
Gentoo Linux developer (council, perl, libreoffice) |
20 |
dilfridge@g.o |
21 |
http://www.akhuettel.de/ |
22 |
-----BEGIN PGP SIGNATURE----- |
23 |
Version: GnuPG v2 |
24 |
|
25 |
iQIcBAEBCgAGBQJWGPdvAAoJEB9VdM6hupKVja0P/AwpNaoosq4f0DyWGJ4E+izk |
26 |
p44fEeUzZaG1r9BerkgeqP0A/kqXnVnHMae5ez1Ch2zcozl5gGcXbGPsR8K6Pv/4 |
27 |
p76pLyqzbjPAoxqj2Cm7ysLrghBdXttpbEeRLeXkMUYqLiHpNZQYyAteU3ePV2Bv |
28 |
KIXFopr1FyJCi1b211gbuUVZuiBaWWLQphmI/T/zja2pk8T/Cb6xPv3snTql8PiE |
29 |
nQbeoFThRKL5aEyAw7hxL4ZGDlfRHfpOEG3WTtu7UD/s2jUjEULIfiHcn+f4Dmr4 |
30 |
AVcsgo8JeiTtB5URs87eT3sRAbMQxcV0bGOCnQLJPl2sT5Um4ix0k4hhhUPj5IGv |
31 |
MX+GY/pLoLFSNE3GyEdal7Bv95khI3EsLDQBIGgFoaWH0UvMuCIDQGdD+z+pm/hR |
32 |
mBbOHHKEtRJZIrTvyVSPSbJvCHGEjlLu2oIvFgeSakkat7wCBVuxnATxoePYQj0/ |
33 |
22YIHbsZ6llK8WKTjagghIwbMGn4INGqWnmUdokPcntjBbHCm8P6OR5pl/rprblN |
34 |
qmiJIhAjkCct5ZuavpVySVMtTC/xLkY0m51/PGyRDsblwBmQb9chxp2CWMQrcLIq |
35 |
xcloOMALgLqPLHZn8r31WmAtsyhFCOojmGT3hKXoBTlW9HF8qB8g2V4PSkIya4ya |
36 |
RF559tulkOI8D+18rAnb |
37 |
=4TY0 |
38 |
-----END PGP SIGNATURE----- |