title: git fails because of an untracked working tree file
body: <p>I'm not an expert at google. Needless to say, I'm not even sure what this means or how to resolve it?</p>
  
  <pre><code>&gt;&gt; git merge admin_playground
  error: Untracked working tree file 'vendor/gems/panda-1.0.0/.gitignore' would be overwritten by merge.
  fatal: merging of trees 538b2824765956cc44c42a8ad628e4f4 and d5d4cda68518cd1c81bf70ba8c339fea6 failed
  </code></pre>
  
  <p>I am trying to perform a git merge and getting this failing statement.</p>