title: git: aborting pull because of Gemfile.lock file which would be overwritten, even though it is in the .gitignore file
body: <p>I'm pulling my project with git.</p>
  
  <p>I get this error: <code>error: Your local changes to 'Gemfile.lock' would be overwritten by merge.  Aborting.</code>.</p>
  
  <p>But 'Gemfile.lock' is in my .gitignore file, so git should not be interested in overwriting this file.</p>
  
  <p>Any help?</p>
  
  <p>Greets, Joern.</p>