| From: | Simon Riggs <simon(at)2ndQuadrant(dot)com> |
|---|---|
| To: | Magnus Hagander <magnus(at)hagander(dot)net> |
| Cc: | Robert Haas <robertmhaas(at)gmail(dot)com>, Heikki Linnakangas <heikki(dot)linnakangas(at)enterprisedb(dot)com>, pgsql-hackers <pgsql-hackers(at)postgresql(dot)org> |
| Subject: | Re: Hot Standby, release candidate? |
| Date: | 2009-12-14 15:12:13 |
| Message-ID: | 1260803533.1955.791.camel@ebony |
| Views: | Raw Message | Whole Thread | Download mbox | Resend email |
| Thread: | |
| Lists: | pgsql-hackers |
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
| From | Date | Subject | |
|---|---|---|---|
| Next Message | Kevin Grittner | 2009-12-14 15:14:23 | Re: Hot Standby, release candidate? |
| Previous Message | Simon Riggs | 2009-12-14 15:08:49 | Re: Hot Standby, release candidate? |