git/list[1] front-page[2] threads[3] people[4] search[5] about
 

(unknown)

From
AVASHISH VERMA <ashunew1989@gmail.com>
Date
May 17, 2013, 18:02 UTC
Message-ID
<CAED3JAZa8iB=rZqZ9sUfAqqtzHaMS3-6m0r=TnaBBRtYTF0XMw@mail.gmail.com>

Hi, i am using git to push my code from eclipse to heroku , but recently iam getting error like::

master:master rejected:non fast forward

and i am not able to resolve it .I tried a git pull but that says - conflicts shud be resolved before git pull can be implemented.I can;t find the solution Please help ASAP...

ASHISH
Next: Magnus Bäck
Message 1 of 2 in “(unknown)”
  1. ASHISH VERMAMay 17, 2013
  2. Magnus BäckMay 21, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.