title: Changed files on github and now cant push
body: <p>So I have my git repository for a project I am working on.</p>
  
  <p>I set up the settings.py file for the first commit like how I wanted it on the server and then I ran <code>git update-index --assume-unchanged mysite/settings.py</code> as I didnt want any changes to be pushed to the server, as the settings are different for production. Now, I wanted to add some new settings, so I added them in my browser, saved them, and git pulled them onto my server.</p>
  
  <p>Now when I am trying to push new code from my laptop I get this error:</p>
  
  <pre><code>To https://github.com/badger1661/smart-survey.git
   ! [rejected]        master -&gt; master (non-fast-forward)
  error: failed to push some refs to 'https://github.com/badger1661/smart-survey.git'
  hint: Updates were rejected because the tip of your current branch is behind
  hint: its remote counterpart. Integrate the remote changes (e.g.
  hint: 'git pull ...') before pushing again.
  hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  </code></pre>
  
  <p>How can I fix this. I want to keep the changes to the settings I made on github, but dont want them on my laptop.</p>