Conflict resolution after Git error non-fast-forward github

1. $ git add balabla
2. $ git commit -m "balabala"
3. $ git git remote add origin http://balabala
5. (if: fatal: remote origin already exists ) ( if an error is reported )
7. $ git remote rm origin
8. $ git git remote add origin http://balabala

  

Error when executing git push origin master:

    error:failed to push som refs to.......

 

 

1. $ git config branch.master.remote origin  
2. $ git config branch.master.merge refs/heads/master 

$ git pull
 then push

I don't know if you understand

 

Here is the link to the original author's blog: http://blog.csdn.net/chain2012/article/details/7476493

 

Other related links: http://blog.jobbole.com/78960/

http://lazynight.me/2898.html