{"thread":{"id":"33855","subject":"(unknown)","startedAt":"2013-05-17T18:02:19Z","lastAt":"2013-05-21T13:13:35Z","messageCount":2,"participants":["ASHISH VERMA","Magnus Bäck"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"217748","messageId":"CAED3JAZa8iB=rZqZ9sUfAqqtzHaMS3-6m0r=TnaBBRtYTF0XMw@mail.gmail.com","threadId":"33855","inReplyTo":null,"subject":"(unknown)","fromName":"ASHISH VERMA","fromEmail":"ashunew1989@gmail.com","sentAt":"2013-05-17T18:02:19Z","receivedAt":"2013-05-17T18:02:19Z","isPatch":false,"sender":{"key":"ashunew1989@gmail.com","avatar":null},"body":"Hi,  i am using git to push my code from eclipse to heroku , but\nrecently iam  getting error like::\n\nmaster:master rejected:non fast forward\n\nand i am not able to resolve it .I tried a git pull but that says -\nconflicts shud be resolved before git pull can be implemented.I can;t\nfind the solution Please help ASAP...\n\n\n\nASHISH\n"},{"id":"218046","messageId":"20130521131334.GB634@google.com","threadId":"33855","inReplyTo":"CAED3JAZa8iB=rZqZ9sUfAqqtzHaMS3-6m0r=TnaBBRtYTF0XMw@mail.gmail.com","subject":"Re: your mail","fromName":"Magnus Bäck","fromEmail":"baeck@google.com","sentAt":"2013-05-21T13:13:35Z","receivedAt":"2013-05-21T13:13:35Z","isPatch":false,"sender":{"key":"baeck@google.com","avatar":null},"body":"On Friday, May 17, 2013 at 14:02 EDT,\n     ASHISH VERMA <ashunew1989@gmail.com> wrote:\n\n> Hi,  i am using git to push my code from eclipse to heroku , but\n> recently iam  getting error like::\n> \n> master:master rejected:non fast forward\n> \n> and i am not able to resolve it .I tried a git pull but that says -\n> conflicts shud be resolved before git pull can be implemented.I can;t\n> find the solution Please help ASAP...\n\nResolve the conflicts by either hand-editing the files (you'll see the\nmarkers where the conflicts are) add running 'git add' to tell git that\nyou're done resolving them, or set up Git to use a graphical tool like\nkdiff3. When you're done, run 'git commit' to create the merge commit.\nAfter that you'll be able to push to your upstream (unless things have\nmoved again while you were resolving the initial conflict).\n\nThis guide to merge conflicts looks pretty good:\nhttp://gitguru.com/2009/02/22/integrating-git-with-a-visual-merge-tool/\n\n-- \nMagnus Bäck\nbaeck@google.com\n"}]}