git pull - reporting that I modified files, but I did not

2013-01-17 Thread Jay Vee
When I do a git pull, I am getting a messages that changes to local files would be overwritten by a merge, but I have not changed these files locally at all, I have not opened them in my IDE. This happens every now and then. 1) Why does this happen? 2) How do I prevent this from happening in

Re: git pull - reporting that I modified files, but I did not

2013-01-17 Thread Max Horn
On 17.01.2013, at 20:29, Jay Vee wrote: When I do a git pull, I am getting a messages that changes to local files would be overwritten by a merge, but I have not changed these files locally at all, I have not opened them in my IDE. This happens every now and then. 1) Why does this