I’ve been trying to get a copy of my web app on PHP Fog, but it needs to be sent by Git. I’m completely new to Git, and to be honest, I don’t understand it. I followed several tutorials (the best I found was http://rogerdudler.github.com/git-guide/), and I still can’t get my web app to upload. As I understand it, I need to first add my local files to a new git repository. Then I need to ‘push’ this repository to the remote server’s repository.
On this last step I get an error; “Updates were rejected because the tip of your current branch is behind its remote counterpart. Merge the remote changes before pushing again”. And I have absolutely no idea how to go on from here.
if you want to use any paths (or other variables) in your examples, these are the ones (I believe) are needed in my case:
local folder:
C:\wamp\www\webgame
clone command provided by PHP Fog:
$ git clone git@git01.phpfog.com:webgame.phpfogapp.com
If you need any more info, please do ask.
There are some earlier pushes on the remore server’s repository. Pull the changes, merge and then push your changesets.