title: How do I git pull without overwriting a single file
body: <p>I'm very new to git.  I use </p>
  
  <pre><code>git push origin master
  </code></pre>
  
  <p>to push my app, and </p>
  
  <pre><code>git pull origin master
  </code></pre>
  
  <p>to pull it down.  I do not want to overwrite one single file: db/development.sqlite3, because it has all of the data that has been inputted by users on my live app.  However, when I push changes from my developing computer, then go to pull them to the live server, I get an error saying that I cannot pull changes because that file is different now and would be overwritten by the merge.  It says please commit your changes or stash them before you can merge.  But I just want git to not pull and overwrite that file at all.</p>