public inbox for [email protected]  

help / color / mirror / Atom feed

From: Andrew Dunstan <[email protected]>
To: Stephen Frost <[email protected]>
To: Tom Lane <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Subject: Re: git failures
Date: Tue, 3 Jan 2017 21:15:15 -0500
Message-ID: <[email protected]> (raw)
In-Reply-To: <CAOuzzgrxBcMiZLNyB3w61303fTR0ovC-r8Z1dGspGrsrK7kS8g@mail.gmail.com>
References: <[email protected]>
	<[email protected]>
	<[email protected]>
	<CAOuzzgqT7LQyn+bUKp_b8p2DGGqYk5TwAH7zWgGOUZXCkVX-PQ@mail.gmail.com>
	<[email protected]>
	<CAOuzzgrxBcMiZLNyB3w61303fTR0ovC-r8Z1dGspGrsrK7kS8g@mail.gmail.com>
List-Unsubscribe:  <mailto:[email protected]?body=unsub%20buildfarm-members>



On 01/03/2017 08:32 PM, Stephen Frost wrote:
>
> On Tue, Jan 3, 2017 at 20:25 Tom Lane <[email protected] 
> <mailto:[email protected]>> wrote:
>
>     Stephen Frost <[email protected] <mailto:[email protected]>> 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.
>


That didn't work for me. I removed that directory altogether, and I 
expect the next buildfarm run to rebuild it cleanly.

cheers

andrew


-- 

Andrew Dunstan                https://www.2ndQuadrant.com
PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services



-- 
Sent via buildfarm-members mailing list ([email protected])
To make changes to your subscription:
http://www.postgresql.org/mailpref/buildfarm-members

view thread (12+ messages)  latest in thread

reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients using the --to and --cc options:
  reply via email

  To: [email protected]
  Cc: [email protected], [email protected], [email protected], [email protected], [email protected]
  Subject: Re: git failures
  In-Reply-To: <[email protected]>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox