title: How do I fix REJECT NON FAST FORWARD error on Github?
body: <p>Yesterday and for about months I was able to push/commit. But since few hours ago I cannot commit and push in my own private repository anymore. I have 2 new collaborator, and they have same problem as me. </p>
  
  <p>How to resolve this?</p>
  
  <ol>
  <li>tried pulling before push</li>
  <li>tried commit and it always says local conflict need to be resolved</li>
  <li>Then i resolved local conflict and accepted all </li>
  <li>Again it says push failed which is annoying error all the time now</li>
  </ol>
  
  <p>Everytime it says hat follow result.</p>
  
  <pre><code>==[IDE]== Feb 7, 2012 11:33:21 AM Pushing
  git push git@github.com:a/b.git +refs/heads/master:refs/heads/master
  git push git@github.com:a/b.git +refs/heads/master:refs/heads/master
  Remote Repository Updates
  Branch : master
  Old Id : f3b00695638eec 
  New Id : c79bc1a4650 
  Result : REJECTED_NONFASTFORWARD
  
  Local Repository Updates
  Branch : origin/master
  Old Id : f3b00695 
  New Id : c79bc1a4650e02 
  Result : NOT_ATTEMPTED
  
  ==[IDE]== Feb 7, 2012 11:34:34 AM Pushing finished.
  </code></pre>