I have just started to use git and I am getting this error:

error: Entry 'config/environment.rb' not uptodate. Cannot merge.

I am trying to sync up two computers to use a central repository on
git and I think I am getting this error b/c I have changed something
in the environment.rb file on the computer I am trying to pull to.
How do I go about ignoring this change and overwriting with a pull
from git?
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com
To unsubscribe from this group, send email to 
For more options, visit this group at 

Reply via email to