title: Missing files after git pull?
body: <p>I have a remote that is the same, or similar, to the rails project in my current directory. To sync the two, I do</p>
  
  <pre><code>git init
  git remote add origin blah@blah
  git pull
  </code></pre>
  
  <p>The problem is that some of the files I had in my working copy were added (ie not in the remote), so when I do</p>
  
  <pre><code>git status 
  </code></pre>
  
  <p>it should show a bunch of untracked files. Instead I see the files from the repo that are out of date.<br>
  Why didn't it ask me to resolve conflicts in these files? And where are my old files?</p>