On Mon, Dec 14, 2009 at 13:47, Simon Riggs <si...@2ndquadrant.com> wrote: > On Mon, 2009-12-14 at 07:33 -0500, Robert Haas wrote: >> On Mon, Dec 14, 2009 at 7:22 AM, Simon Riggs <si...@2ndquadrant.com> wrote: >> > I am now unable to push these changes to the shared repo. What is >> > happening? >> >> Perhaps you need to run cvs update on your local copy? >> >> (I find this flavor the most useful: "cvs -q update -d" YMMV.) >> >> If that's not it, error message? > > It was a question for Heikki only, not a CVS issue. > > git push ssh://g...@git.postgresql.org/users/heikki/postgres.git > hs-simon:hs-riggs > To ssh://g...@git.postgresql.org/users/heikki/postgres.git > ! [rejected] hs-simon -> hs-riggs (non-fast forward) > error: failed to push some refs to > 'ssh://g...@git.postgresql.org/users/heikki/postgres.git'
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. -- Magnus Hagander Me: http://www.hagander.net/ Work: http://www.redpill-linpro.com/ -- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers
