From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1Sn7Gh-0006is-2W for garchives@archives.gentoo.org; Fri, 06 Jul 2012 12:04:15 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7634E03E0 for ; Fri, 6 Jul 2012 12:04:14 +0000 (UTC) Received: from mail.not-your-server.de (mail.not-your-server.de [78.46.182.243]) by pigeon.gentoo.org (Postfix) with ESMTP id 788E2E0768 for ; Fri, 6 Jul 2012 09:15:32 +0000 (UTC) Received: from localhost (mail.not-your-server.de [127.0.0.1]) by mail.not-your-server.de (Postfix) with ESMTP id D9F3355EF2; Fri, 6 Jul 2012 11:15:31 +0200 (CEST) X-Virus-Scanned: amavisd-new at local Received: from mail.not-your-server.de ([127.0.0.1]) by localhost (static.243.182.46.78.clients.your-server.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hDfNohRGquGu; Fri, 6 Jul 2012 11:15:25 +0200 (CEST) Received: from paul.ics.kfa-juelich.de (unknown [10.11.12.34]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.not-your-server.de (Postfix) with ESMTPSA id CC7A455ED6; Fri, 6 Jul 2012 11:15:25 +0200 (CEST) Message-ID: <4FF6ACAD.20001@gentoo.org> Date: Fri, 06 Jul 2012 11:15:25 +0200 From: justin User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:13.0) Gecko/20120625 Thunderbird/13.0 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-science@lists.gentoo.org Reply-to: gentoo-science@lists.gentoo.org MIME-Version: 1.0 To: gentoo-science@lists.gentoo.org Subject: Re: [gentoo-science] github and o.g.o sync References: <4FF698FB.6040501@gmail.com> In-Reply-To: <4FF698FB.6040501@gmail.com> X-Enigmail-Version: 1.4.2 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="------------enigCDB14C07AF8DC987302B32FC" X-Archives-Salt: f85c34a8-1ecd-43c8-b8b1-1e70938b80d4 X-Archives-Hash: fb8f8c410488bee035788295e1174378 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigCDB14C07AF8DC987302B32FC Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 06/07/12 09:51, Kacper Kowalik wrote: > On 07/05/2012 10:46 PM, Christoph Junghans wrote: >> Hi, >> >> recently it happened to me that the sci overlay on github and o.g.o >> got out of sync. >> (timcera pushed to github only and I pushed to o.g.o first and then >> the push to the 2nd url failed) >> >> I really think we should autosync them as with more pull request this >> situation will get more likely. > To my knowledge it's impossible to sync two rw git repos. All severe > conflicts need manual resolution, the trival ones are delt with git > push/pull --all already. > Both repos were out of sync just a momement ago, but it was "fixable" i= n fixable -> octupus I love that term. --------------enigCDB14C07AF8DC987302B32FC Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) Comment: GPGTools - http://gpgtools.org Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEAREKAAYFAk/2rK0ACgkQgAnW8HDreRb9mgCgoVpFnDPs98SCBcExI2vIYrtB /poAn2MsaTisuneWa7TcVueKpyn5/uyC =wuJL -----END PGP SIGNATURE----- --------------enigCDB14C07AF8DC987302B32FC--