From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-science+bounces-1867-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id A4AD0138247
for <garchives@archives.gentoo.org>; Thu, 7 Nov 2013 20:34:56 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D76A6E09C3;
Thu, 7 Nov 2013 20:34:51 +0000 (UTC)
Received: from mail-ob0-f178.google.com (mail-ob0-f178.google.com [209.85.214.178])
(using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 41DBFE09AA
for <gentoo-science@lists.gentoo.org>; Thu, 7 Nov 2013 20:34:50 +0000 (UTC)
Received: by mail-ob0-f178.google.com with SMTP id va2so613097obc.37
for <gentoo-science@lists.gentoo.org>; Thu, 07 Nov 2013 12:34:50 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20120113;
h=mime-version:in-reply-to:references:from:date:message-id:subject:to
:content-type;
bh=QFECNdRdDQkmBXzt7t3dFqkmDs1wD2DajhrZdjfQKKw=;
b=mEMUV17VqwjcJ9jClKIZuhg9XrZTL+2KCXakryXVTqUqa1NybWWP32kZ+9O4liictH
4/kG0YJbn54TMJCHeNU+XP9w/sgueuu2TdKAbYvITk6QPdY2K0xmpEUWgkhe82w+r2Rn
8TXKMQa7QI3yAte1y1a9rlxxDcKhmlYmj9cAF4LP0TfAfZRhDWJxt3vdILpWW0zdIE2g
+dLamqCG+PDiARn4OsWE1xfCDOvTd59KXIWLezrQADrwP31kcl0h/ny3xcnw8fb84O47
ge1t4NJesCilmHFkLsBPtTkA3hopI1DSLl2fk2STvE1qQL78gOBJRqlDL18jYDR4qPWg
DE+Q==
X-Received: by 10.182.102.2 with SMTP id fk2mr1395645obb.69.1383856490104;
Thu, 07 Nov 2013 12:34:50 -0800 (PST)
Precedence: bulk
List-Post: <mailto:gentoo-science@lists.gentoo.org>
List-Help: <mailto:gentoo-science+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-science+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-science+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-science.gentoo.org>
X-BeenThere: gentoo-science@lists.gentoo.org
Reply-to: gentoo-science@lists.gentoo.org
MIME-Version: 1.0
Received: by 10.182.118.66 with HTTP; Thu, 7 Nov 2013 12:34:10 -0800 (PST)
In-Reply-To: <527BF6A3.5050107@gentoo.org>
References: <52795508.3030803@gentoo.org> <527BF6A3.5050107@gentoo.org>
From: Nicolas Bock <nicolasbock@gmail.com>
Date: Thu, 7 Nov 2013 13:34:10 -0700
Message-ID: <CAPMKG4DAtr=0RdB=KqO7dG45C41NQa806wko8_RwfcoqkK4PRQ@mail.gmail.com>
Subject: Re: [gentoo-science] Git push problems
To: gentoo-science@lists.gentoo.org
Content-Type: multipart/alternative; boundary=089e013a0420834ce204ea9c320b
X-Archives-Salt: 2ffc623d-44a3-4247-95f0-63557608fad5
X-Archives-Hash: f3fc71c3a5f349fac595c04305e32183
--089e013a0420834ce204ea9c320b
Content-Type: text/plain; charset=UTF-8
Thanks for the recipe!
On Thu, Nov 7, 2013 at 1:22 PM, justin <jlec@gentoo.org> wrote:
> Hi,
>
> after talking to our infra guys and alexxy about it, I came to the point
> that we should still allow commits to both repos for everyone with
> commit access.
>
> To avoid future trouble here are some rules to stick to.
>
> * Don't _amend_ already pushed commits.
> * Don't _rebase_ already pushed commits.
> * Don't --force a push.
>
> In case you still have problems, then follow this receipt from alexxy.
> He will write some longer instructions soonish in the wiki.
>
> $ git fetch --all (assume that you added github as another upstream.
> origin is g.o.g.o and github is github)
> $ git merge github/master
> $ git push origin
> that will merge github to g.o.g.o
> now we should merge g.o.g.o back to github
> $ git checkout -b github github/master
> $ git merge origin/master
> $ git push github HEAD:master
> $ git checkout master
>
> That should fix our problems.
>
> Justin
>
>
--089e013a0420834ce204ea9c320b
Content-Type: text/html; charset=UTF-8
<div dir="ltr">Thanks for the recipe!</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Nov 7, 2013 at 1:22 PM, justin <span dir="ltr"><<a href="mailto:jlec@gentoo.org" target="_blank">jlec@gentoo.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi,<br>
<br>
after talking to our infra guys and alexxy about it, I came to the point<br>
that we should still allow commits to both repos for everyone with<br>
commit access.<br>
<br>
To avoid future trouble here are some rules to stick to.<br>
<br>
* Don't _amend_ already pushed commits.<br>
* Don't _rebase_ already pushed commits.<br>
* Don't --force a push.<br>
<br>
In case you still have problems, then follow this receipt from alexxy.<br>
He will write some longer instructions soonish in the wiki.<br>
<br>
$ git fetch --all (assume that you added github as another upstream.<br>
origin is g.o.g.o and github is github)<br>
$ git merge github/master<br>
$ git push origin<br>
that will merge github to g.o.g.o<br>
now we should merge g.o.g.o back to github<br>
$ git checkout -b github github/master<br>
$ git merge origin/master<br>
$ git push github HEAD:master<br>
$ git checkout master<br>
<br>
That should fix our problems.<br>
<span class="HOEnZb"><font color="#888888"><br>
Justin<br>
<br>
</font></span></blockquote></div><br></div>
--089e013a0420834ce204ea9c320b--