Wiki Forum Sign up! Explore Home

Not signed in (Sign In)

LiveSearch

Welcome, Guest

Want to take part in these discussions? Sign in if you have an account, or apply for one below

Vanilla 1.1.2 is a product of Lussumo. More Information: Documentation, Community Support.

General: GIT pull error

Bottom of Page

1 to 4 of 4

  1.  
    • CommentAuthordarkpollo
    • CommentTimeJun 20th 2008
     permalink
    db/schema.rb: needs update
    lib/daemons/mail_sender.rb: needs update
    fatal: Entry 'db/schema.rb' not uptodate. Cannot merge.

    What is the problem?
    Thanks
    • CommentAuthoradmin
    • CommentTimeJun 20th 2008
     permalink
    When you do a rake db:migrate, db/schema.rb gets re-generated from your database, and different locale settings / mysql versions generate different looking files, which means git thinks you've changed the file and refuses to pull the new one I've committed.

    Do a git checkout db/schema.rb to restore the version from git, and your pull should work again.

    -- Erlend
    • CommentAuthordarkpollo
    • CommentTimeJun 20th 2008
     permalink
    Thanks.
    must i do that every time before to do a "git pull"?
    • CommentAuthoradmin
    • CommentTimeJun 21st 2008
     permalink
    Only if you've done a 'rake db:migrate'. It's also possible to commit your change to your local git repository (which is what Git is complaining about - you've modified a file which I've also modified, and git doesn't want you to lose your changes). If you commit your changes, git will try to merge my changes into yours automatically, but you'll then have to deal with a conflict if we both modify the same lines in the same files.

    -- Erlend

1 to 4 of 4

  1.