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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
