| From: | Stephen Frost <sfrost(at)snowman(dot)net> |
|---|---|
| To: | Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us> |
| Cc: | Andrew Dunstan <andrew(dot)dunstan(at)2ndquadrant(dot)com>, buildfarm-members(at)postgresql(dot)org, craig(at)2ndquadrant(dot)com, glyn(dot)astill(at)seetickets(dot)com |
| Subject: | Re: git failures |
| Date: | 2017-01-04 01:32:29 |
| Message-ID: | CAOuzzgrxBcMiZLNyB3w61303fTR0ovC-r8Z1dGspGrsrK7kS8g@mail.gmail.com |
| Views: | Raw Message | Whole Thread | Download mbox | Resend email |
| Thread: | |
| Lists: | buildfarm-members |
On Tue, Jan 3, 2017 at 20:25 Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us> wrote:
> Stephen Frost <sfrost(at)snowman(dot)net> 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
| From | Date | Subject | |
|---|---|---|---|
| Next Message | Andrew Dunstan | 2017-01-04 02:15:15 | Re: git failures |
| Previous Message | Tom Lane | 2017-01-04 01:24:50 | Re: git failures |