On Mon, 2009-12-14 at 13:56 +0100, Magnus Hagander wrote: > Same issue can be it in git - did you do a "git pull" before? You may > need merging with what's on there, and for that to work you must pull > before you can push.
Found some merge conflicts and resolved them. I did fetch and merge at different times, so that seems to be the source. I've resolved the other git issues, so latest version on git now. -- Simon Riggs www.2ndQuadrant.com -- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers