Stephen Frost <sfrost@snowman.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