From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-science+bounces-1984-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 A9C2413877A
for <garchives@archives.gentoo.org>; Wed, 2 Jul 2014 11:20:07 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id BF196E086F;
Wed, 2 Jul 2014 11:20:05 +0000 (UTC)
Received: from mail-pd0-f180.google.com (mail-pd0-f180.google.com [209.85.192.180])
(using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 203ADE084B
for <gentoo-science@lists.gentoo.org>; Wed, 2 Jul 2014 11:20:05 +0000 (UTC)
Received: by mail-pd0-f180.google.com with SMTP id fp1so11829095pdb.39
for <gentoo-science@lists.gentoo.org>; Wed, 02 Jul 2014 04:20:04 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20120113;
h=content-type:mime-version:subject:from:in-reply-to:date
:content-transfer-encoding:message-id:references:to;
bh=EcBSlE1pNXotyGRb4A0oIdEg2dcekdp0wFvhlhTmBck=;
b=kuCT3waZSlldnT7NtJrcI8avqC/UD77ThC7yOirh6ZtHWoEMmhntkhqcSPz7bqfqFO
N7SfWF08yDs/AUfHZWgfW06rJdR2da5sYnH7vvDQbbjYsXzfTQCqJL2RKRE4jBEZqaSt
kQ291rB8uXQkLlkHcT0Ja/P/WLLpi6pfKT6F1awiDdrAWSHj8tiIAS5MK+Rp33+iRSx0
5gxrj69YEzRmIUE5zA4z7BU9vl97NGYDF5SmpnlkEKj2P2CGCzyy3Rle2aFn4VKIPoba
eLgTVI4Lf3fSw67xzSOYC6HbHIBeGSuJ0gZizP2gDiW4PbKv8UadhHx+mI4cwrbNitdo
N7/g==
X-Received: by 10.68.162.34 with SMTP id xx2mr69023325pbb.120.1404300004183;
Wed, 02 Jul 2014 04:20:04 -0700 (PDT)
Received: from [192.168.1.6] (124-197-26-165.callplus.net.nz. [124.197.26.165])
by mx.google.com with ESMTPSA id yv7sm128880935pac.33.2014.07.02.04.20.01
for <gentoo-science@lists.gentoo.org>
(version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
Wed, 02 Jul 2014 04:20:02 -0700 (PDT)
Content-Type: text/plain; charset=windows-1252
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 (Mac OS X Mail 7.3 \(1878.2\))
Subject: Re: [gentoo-science] overlay and github out of sync again
From: =?windows-1252?Q?Fran=E7ois_Bissey?= <frp.bissey@gmail.com>
In-Reply-To: <53B3EA00.8070201@gentoo.org>
Date: Wed, 2 Jul 2014 23:19:57 +1200
Content-Transfer-Encoding: quoted-printable
Message-Id: <61D9C14D-486D-4B95-95EA-E7F311A03DC7@gmail.com>
References: <2D807E86-C7E7-47A0-8BA5-8689A2CAACA6@gmail.com> <53B3EA00.8070201@gentoo.org>
To: gentoo-science@lists.gentoo.org
X-Mailer: Apple Mail (2.1878.2)
X-Archives-Salt: d15925da-f5b7-4982-95f5-b6592406f6ea
X-Archives-Hash: a9af2ca583d38a7473bd862a0939bdaf
Consider that I am the village idiot, you have to explain to me how you
integrated the two branches that each had a commit that the other didn=92t=
have.
Fran=E7ois
On 2/07/2014, at 23:16, Jauhien Piatlicki <jauhien@gentoo.org> wrote:
> Hi Fran=E7ois,
>=20
> On 07/02/2014 12:40 PM, Fran=E7ois Bissey wrote:
>> Hi,
>>=20
>> The overlay are out of sync again. When jlec merged pynomo
>> earlier today it wasn=92t pushed to the Gentoo overlay for a reason
>> or another.
>> And then I pushed a minor keywording for x64-macos and it did
>> go on the Gentoo overlay but not on github.
>>=20
>> I cannot remember how to resolve the problem, do we have =
documentation
>> elsewhere than on the mailing list in post several years old for =
that?
>>=20
>=20
> Resolved. Just merged the changes as we anyway use merges working with
> pull requests. I mean, our git process is based on merges, so merging
> unsynced branches does not create problems.
>=20
> Regards,
> Jauhien
>=20