Git on live Windows Server - Trying to pull from the repo but local files already modified

Question

I have my Git repository hosted at github.com. I would like to push updates and such to github.com and then log into my Windows server and do a git pull to get my changes (that are verified to work on my local machine. Ideally I should have another server setup as my local machine settings are different from the live server. But I'm cheap.).

It seems like whenever I try to do a git pull on the server, the files seem to get modified somehow since the last pull. And so I am unable to get the update as git says I need to commit my local (Windows server) changes.

How can I use git like I want to? Or is there a better way?

Answer 1

Is it possible you change the git core.autocrlf flag after cloning the repository?

Issue 83 on the google code project form msysGit goes deeper in on this topic.

If that it the case, doing a new clone should fix the problem (as long as the flag is not touched).