title: git - strange branch merge error that I am not sure how to solve
body: <p>When I git status, I get this error message:</p>
  
  <pre><code># On branch master
  # Your branch and 'origin/master' have diverged,
  # and have 1 and 2 different commits each, respectively.
  #
  # Untracked files:
  #   (use "git add &lt;file&gt;..." to include in what will be committed)
  #
  #   .gitignore
  nothing added to commit but untracked files present (use "git add" to track)
  </code></pre>
  
  <p>So I can't pull or push.  When I pull I get this:</p>
  
  <pre><code>macoss-MacBook-Pro-10:Marketing owner12$ git pull origin master
  Password for 'https://genadinik@bitbucket.org': 
  From https://bitbucket.org/genadinik/marketing
   * branch            master     -&gt; FETCH_HEAD
  error: The following untracked working tree files would be overwritten by merge:
      .DS_Store
  Please move or remove them before you can merge.
  Aborting
  </code></pre>
  
  <p>What can I do to resolve this?
  Thanks!</p>