title: What does "Git push non-fast-forward updates were rejected" mean?
body: <p>I'm using Git to manage my two computers and my development. I'm trying to commit changes to GitHub, and I got this error:</p>
  <blockquote>
  <p>Failed to push some refs to <code>&lt;repo&gt;</code>. To prevent you from losing history, non-fast-forward updates were rejected. Merge remote changes before pushing again.</p>
  </blockquote>
  <p>What could be causing this, and how can I fix this?</p>
  <p><strong>EDIT:</strong></p>
  <p>Pulling the repo returns the following:</p>
  <blockquote>
  <p>*branch    master-&gt;master (non-fast-forward)
  Already-up-to-date</p>
  </blockquote>
  <p>Pushing still gives me the aforementioned error.</p>