Archives
Archives
| From: | hasufell <hasufell@g.o> | ||
|---|---|---|---|
| To: | gentoo-dev@l.g.o | ||
| Subject: | Re: [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: / | ||
| Date: | Sat, 10 Oct 2015 11:36:16 | ||
| Message-Id: | 5618F81C.5050302@gentoo.org | ||
| In Reply to: | [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: / by "Andreas K. Huettel" |
||
| 1 | On 10/10/2015 01:33 PM, Andreas K. Huettel wrote: |
| 2 | > |
| 3 | >> You should (almost) never commit reverse-merges of git.gentoo.org |
| 4 | >> master[0]. |
| 5 | > |
| 6 | >> Instead, you have to use |
| 7 | >> git pull --rebase=preserve origin master |
| 8 | > |
| 9 | >> in case you get "push conflicts" [1] |
| 10 | > |
| 11 | > |
| 12 | > Which I tried several times, but git steadfast refused to sign the commit |
| 13 | > properly. Maybe a new bug somewhere? |
| 14 | > |
| 15 | |
| 16 | What was the error message? Can you reproduce that with a few test commits? |