{"thread":{"id":"14818","subject":"I've tried to read the manuals, but \"git pull\" just won't work","startedAt":"2008-08-03T04:58:19Z","lastAt":"2008-08-03T05:21:32Z","messageCount":2,"participants":["Bruce Korb","Matt Pearson"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"86038","messageId":"668c430c0808022158s56e22c56t3bbd61eef59d7b32@mail.gmail.com","threadId":"14818","inReplyTo":null,"subject":"I've tried to read the manuals, but \"git pull\" just won't work","fromName":"Bruce Korb","fromEmail":"bruce.korb@gmail.com","sentAt":"2008-08-03T04:58:19Z","receivedAt":"2008-08-03T04:58:19Z","isPatch":false,"sender":{"key":"bruce.korb@gmail.com","avatar":"https://gravatar.com/avatar/86d91467dc7cc8466a9d133a7b93a5d21233052017c144c9a6f6f7e5110344d0?d=mp&s=160"},"body":"Sorry, I don't know where else to turn.\nI've modified my local copy of ChangeLog and my \"git pull\" says, \"Oh, oh!\nYou'd overwrite your changes\" and refuses to pull.  I tried\n\"git reset HEAD  ChangeLog\", but it says all sorts of crazy things\nthat make no sense and I'm still stuck.  I know I can fix this:\npull my edits into a patch, throw away my repository, clone a fresh\ncopy.  There has to be a better way.  The better  way is just too\nobtuse to figure out.....Help, please?  Thank you.\n"},{"id":"86039","messageId":"706b4240808022221we345b13md95e0dacf9436dba@mail.gmail.com","threadId":"14818","inReplyTo":"668c430c0808022158s56e22c56t3bbd61eef59d7b32@mail.gmail.com","subject":"Re: I've tried to read the manuals, but \"git pull\" just won't work","fromName":"Matt Pearson","fromEmail":"404emailnotfound@gmail.com","sentAt":"2008-08-03T05:21:32Z","receivedAt":"2008-08-03T05:21:32Z","isPatch":false,"sender":{"key":"404emailnotfound@gmail.com","avatar":null},"body":"On Sun, Aug 3, 2008 at 12:58 AM, Bruce Korb <bruce.korb@gmail.com> wrote:\n> Sorry, I don't know where else to turn.\n> I've modified my local copy of ChangeLog and my \"git pull\" says, \"Oh, oh!\n> You'd overwrite your changes\" and refuses to pull.  I tried\n> \"git reset HEAD  ChangeLog\", but it says all sorts of crazy things\n> that make no sense and I'm still stuck.  I know I can fix this:\n> pull my edits into a patch, throw away my repository, clone a fresh\n> copy.  There has to be a better way.  The better  way is just too\n> obtuse to figure out.....Help, please?  Thank you.\n\nDepends on whether you want to keep the changes you made or not. If\nyou don't care about the changes, 'git checkout -- ChangeLog' will\nremove the local changes. If you want to keep the changes, you can\nstash them away with 'git stash', then do the pull, then re-add the\nchanges (and maybe have to resolve conflicts) with 'git stash apply'.\nYou could also just commit the changes. If you still can't get it to\nwork, you're going to have to paste actual program output (the output\nfrom status would probably help).\n\nMatt\n"}]}