Workarounds for GIT local library push remote library version conflicts

Reference: http://blog.csdn.net/shiren1118/article/details/7761203

Workarounds for version and local version conflicts on GitHub

$ git push XXX master
Push the latest changes to the local master branch to the remote library XXX

Username for ' https://github.com ': shiren1118
Password for ' https://[email protected] ':
To Https://github.com/shiren1118/iOS_code_agile.git
! [Rejected] master, master (Non-fast-forward)
Error:failed to push some refs to ' https://github.com/shiren1118/iOS_code_agile.git '
Hint:updates were rejected because the tip of your current branch is behind
Hint:its remote counterpart. Merge the remote changes (e.g. ' git pull ')
Hint:before pushing again.
Hint:see the ' Note about Fast-forwards ' "Git push--help ' for details.

Tick Force Overwrite existing branch (may lose changes), then click Upload, upload successfully.

[Master] [~/downloads/ios] $ git push XXX master-f

Workarounds for GIT local library push remote library version conflicts