public inbox for [email protected]  

help / color / mirror / Atom feed

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

On Tue, Jan 3, 2017 at 20:25 Tom Lane <[email protected]> wrote:

> Stephen Frost <[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.

Thanks!

Stephen

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: <CAOuzzgrxBcMiZLNyB3w61303fTR0ovC-r8Z1dGspGrsrK7kS8g@mail.gmail.com>

* 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