Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cOaRZ-0007Pi-Eh for buildfarm-members@arkaria.postgresql.org; Wed, 04 Jan 2017 01:32:45 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1cOaRY-0001RN-Lk for buildfarm-members@arkaria.postgresql.org; Wed, 04 Jan 2017 01:32:44 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1cOaRY-0001RH-Ew for buildfarm-members@postgresql.org; Wed, 04 Jan 2017 01:32:44 +0000 Received: from mail-lf0-f48.google.com ([209.85.215.48]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1cOaRU-0006b8-NR for buildfarm-members@postgresql.org; Wed, 04 Jan 2017 01:32:43 +0000 Received: by mail-lf0-f48.google.com with SMTP id d16so4580522lfb.1 for ; Tue, 03 Jan 2017 17:32:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=wiZT26wPN2rFSDHxwklXoPbIYdbDTMDaze2bVO7Bz6E=; b=N4FefK5N5QHD+h9ubHCOd50ebdFWuiZb2Nwihf9sFrdDLmqAicZeylCSqbNb6YvCp3 vSUOXzG81aVyrjusm+1WxAIbU7WywGpibBdQyCQ235OqwmnzuD2eFTcDVbhNM0cijsPD ah8NQQtX2+MvoZVFjZemRgiTtTM7K5YKZWZ7a7xEiuw18Y23ORAfAf4at8Lb74t+eSBA YZGdY3bIKEbqsFIzr8d/1bnYIf/qpUFoM3eiTKG1z3zH40pU5UKTYsaE+LCMbeeJYPQD jgae/TxZzHdZlON8R1OZyH9IChZg9gioT2U6wLgs6IimBUmOMpRzUt25L1xMWaO9n3Ep TxNA== X-Gm-Message-State: AIkVDXLe1bPhCVMT+hu1VEm6emCn1EZU/E4D3ANcKeL/BsC+utZ7/OKMBWZLGa22QzubiiaTq2rj/3a61ayuCw== X-Received: by 10.46.70.26 with SMTP id t26mr24427959lja.33.1483493559834; Tue, 03 Jan 2017 17:32:39 -0800 (PST) MIME-Version: 1.0 References: <21316.1483482102@sss.pgh.pa.us> <9f59fc87-2694-f4a3-bd26-66c9d3362e7d@2ndQuadrant.com> <24537.1483493090@sss.pgh.pa.us> In-Reply-To: <24537.1483493090@sss.pgh.pa.us> From: Stephen Frost Date: Wed, 04 Jan 2017 01:32:29 +0000 Message-ID: Subject: Re: git failures To: Tom Lane Cc: Andrew Dunstan , buildfarm-members@postgresql.org, craig@2ndquadrant.com, glyn.astill@seetickets.com Content-Type: multipart/alternative; boundary=f403045f7414a91e3205453ac2e1 X-Pg-Spam-Score: -2.6 (--) List-Archive: List-Help: List-ID: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Mailing-List: buildfarm-members Precedence: bulk Sender: buildfarm-members-owner@postgresql.org --f403045f7414a91e3205453ac2e1 Content-Type: text/plain; charset=UTF-8 On Tue, Jan 3, 2017 at 20:25 Tom Lane wrote: > Stephen Frost writes: > > > I'm hopeful that I fixed it.... > > > > For the benefit of the other people with this problem ... what did you do? > I did a git pull in the REL9_2_STABLE/pgsql directory and accepted the merge commit message. I'm not convinced that was really the "right" or "correct" thing to do, but it seemed to allow subsequent git pull's without erroring or asking for any user interaction. Will look into it more tomorrow. Thanks! Stephen --f403045f7414a91e3205453ac2e1 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

On Tue, Jan 3, 2017 at 20:25 Tom L= ane <tgl@sss.pgh.pa.us> wrot= e:
Stephen Frost <sfrost@snowma= n.net> writes:

> I'm hopeful that = I fixed it....



For t= he benefit of the other people with this problem ... what did you do?

I did a git pull in the REL9_2_S= TABLE/pgsql directory and accepted the merge commit message.=C2=A0

I'm not convinced that was really the "right"= ; or "correct" thing to do, but it seemed to allow subsequent git= pull's without erroring or asking for any user interaction.
=
Will look into it more tomorrow.=C2=A0

<= div>Thanks!

Stephen
--f403045f7414a91e3205453ac2e1--