From: ASHISH VERMA <ashunew1989@gmail.com>
Date: Fri, 17 May 2013 18:02:19 GMT
Subject: (unknown)
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