{"thread":{"id":"32643","subject":"real git pull grief","startedAt":"2013-01-16T00:17:07Z","lastAt":"2013-01-16T00:50:00Z","messageCount":3,"participants":["Jay Vee","Jonathan Nieder"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"206995","messageId":"CADq_mb8LwzbjvaXGCR-6TZbTShf2nzw5wtNZ66_XmOM00-=xzQ@mail.gmail.com","threadId":"32643","inReplyTo":null,"subject":"real git pull grief","fromName":"Jay Vee","fromEmail":"jvsrvcs@gmail.com","sentAt":"2013-01-16T00:17:07Z","receivedAt":"2013-01-16T00:17:07Z","isPatch":false,"sender":{"key":"jvsrvcs@gmail.com","avatar":null},"body":"I have not changed any code and just tried to do a git pull and get\nthe following message:\n\nUpdating 527f1ee..18cf73e\nerror: Your local changes to the following files would be overwritten by merge:\n        java/..../Info.java\nPlease, commit your changes or stash them before you can merge.\nAborting\n----------\n\n\nI HAVE NOT CHANGED THIS FILE.  It is telling me that my local\nchanges.... huh? I have not changed or modified the file.\n\n----\nWhen I do a $git status I see a lot of other files that begin with:\n\n#       modified: ....\n<many of these>\n\n\nHow do I get out of this mess?  I do not want to reset head.  I want\nto get back to the state where it does not think I have modified a\nspecific set of files... namely the files that I did not change.\n\n\nHow did I get into this state?  How do I prevent from getting into\nthis state in the future?  How do I get out of this state now?\n\n\nthanks for all the help.\n\n\nJ.V.\n"},{"id":"206996","messageId":"20130116002046.GF12524@google.com","threadId":"32643","inReplyTo":"CADq_mb8LwzbjvaXGCR-6TZbTShf2nzw5wtNZ66_XmOM00-=xzQ@mail.gmail.com","subject":"Re: real git pull grief","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-01-16T00:20:46Z","receivedAt":"2013-01-16T00:20:46Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Hi Jay,\n\nJay Vee wrote:\n\n> I HAVE NOT CHANGED THIS FILE.  It is telling me that my local\n> changes.... huh? I have not changed or modified the file.\n>\n> ----\n> When I do a $git status I see a lot of other files that begin with:\n>\n> #       modified: ....\n> <many of these>\n\nTwo questions:\n\n * what does \"git diff\" say?\n * do you use Eclipse's git integration?\n\nCurious,\nJonathan\n"},{"id":"206997","messageId":"CADq_mb-tjya_Vd-V9nXSckzjbz1m9g0QXX=Ma28-j0TsZD8jtw@mail.gmail.com","threadId":"32643","inReplyTo":"20130116004534.GG12524@google.com","subject":"Re: real git pull grief","fromName":"Jay Vee","fromEmail":"jvsrvcs@gmail.com","sentAt":"2013-01-16T00:50:00Z","receivedAt":"2013-01-16T00:50:00Z","isPatch":false,"sender":{"key":"jvsrvcs@gmail.com","avatar":null},"body":"git diff shows a list of files that I have made some changes to and\nthe diff for files that I have not changed.\n\nThe files I have made changes to (config files), I never want to\ncommit or push and sometimes I may want them overwritten.  for now I\nsimply want to leave them there (changes to .sql files that are\nspecific to my environment).\n\nWhat I want to know is why git is reporting that changes will be\noverwritten to files that I have not touched or changed.\n\n\n>> $git diff spews a lot of information.\n>\n> Just a representative first 20 lines or so would be fine. :)\n>\n> Jonathan\n"}]}