git pull error when working with remote repository
<p>I set up this project completely new.
I created a <code>remote repository</code> and did this on my local machine.</p>

<pre><code>$ git init
$ git remote add origin git@...
$ git add . 
$ git commit
$ git push -u origin master
$ git branch -u origin/master 
</code></pre>

<p>Then I wrote something into the readme in the <code>remote repository</code>. When I type on my local machine <code>git checkout master</code> I get this:</p>

<blockquote>
  <p>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)</p>
</blockquote>

<p>However, when I try to do <code>$ git pull</code> as suggested I get this: </p>

<blockquote>
  <p>error: The following untracked working tree files would be overwritten by merge:
  README.md
  Please move or remove them before you can merge.</p>
</blockquote>

<p>How do I get the changes from <code>origin</code> to my <code>master</code> then?!</p>