From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B70F0138247 for ; Thu, 7 Nov 2013 20:35:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A3FAE0AC5; Thu, 7 Nov 2013 20:35:24 +0000 (UTC) Received: from mailfilter2.tranzpeer.net (mailfilter-227.tranzpeer.net [202.180.66.227]) by pigeon.gentoo.org (Postfix) with ESMTP id 6BFA6E0AC0 for ; Thu, 7 Nov 2013 20:35:23 +0000 (UTC) Received: from webmail.slingshot.co.nz (webmailfe1.prv.callplus.co.nz [202.189.160.41]) by mailfilter2.tranzpeer.net (Postfix) with ESMTP id C3C9548BB for ; Fri, 8 Nov 2013 17:37:45 +1300 (NZDT) 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 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Date: Fri, 08 Nov 2013 09:35:22 +1300 From: =?UTF-8?Q?Fran=C3=A7ois_Bissey?= To: gentoo-science@lists.gentoo.org Subject: Re: [gentoo-science] Git push problems In-Reply-To: <527BF6A3.5050107@gentoo.org> References: <52795508.3030803@gentoo.org> <527BF6A3.5050107@gentoo.org> Message-ID: X-Sender: fbissey@slingshot.co.nz User-Agent: Roundcube Webmail/0.9.2 X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DATE_IN_PAST_06_12, KHOP_THREADED,LOCAL_SLINGSHOT_TEST,UNPARSEABLE_RELAY autolearn=no version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on spamsrv2 X-Archives-Salt: 944055ff-6c7b-4e91-8b33-fa8158b96a30 X-Archives-Hash: 4b31c572481e9a0f56d60e430703eb3c On 2013-11-08 09:22, justin 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. > Thank you Justin for taking the lead on that. A nice recipe to solve the problem is better than pushing and then going "bugger now I will have to wait for someone else to fix it". Francois