Removing duplicate db migrations from git repository

Question

I\'m trying to deploy a rails app to Heroku and I\'m running into some basic git problems. I\'m new to this all -- rails, git, heroku -- so I\'m afraid I\'m getting lost on what

Answer 1

If you type "git status" it should show the inconsistency. It will say something like this:

# On branch master
# Changed but not updated:
#   (use "git add/rm <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       deleted:    db/migrate/20101007030431_create_favorites.rb

So just follow the instructions there. To permanently remove it from the repository, type:

git rm db/migrate/20101007030431_create_favorites.rb