I set up this project completely new.
I created a
$ git init
$ git remote add origin git@...
$ git add .
$ git commit
$ git push -u origin master
$ git branch -u origin/master
git checkout master
Already on 'master'
Your branch is behind 'origin/master' by 2 commits, and can be fast forwarded.
(use "git pull" to update your local branch)
$ git pull
error: The following untracked working tree files would be overwritten by merge:
Please move or remove them before you can merge.
Like Git says, you have to remove your untracked working tree files (in your case there is only one called 'README.md'). If you have changes you want to keep, commit them, and then do a pull.
Question: why didn't you do a
git clone ...?
When you do a
git pull, git does a
git fetch followed by a
git merge. The merge could be as simple as a fast-forward, if you did not divert from the remote. But if you did, git needs to merge the changes together. To make sure you do not loose any work, git complains if there are changes to a file that will be touched by a merge in your working directory.
To keep your changes you can either
git add README.md), create a stash (
git stash), do a merge (
git merge origin/master) and pop you stash (
git stash pop) or
git add README.mdfollowed by
git commit) and then merge in the changes from the remote (
git merge origin/master)