我 push 时出现的问题求解
-Air:NFC_beta darkh$ git pushTo http://git.oschina.net/lightyear/nfc_beta2.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'http://git.oschina.net/lightyear/nfc_beta2.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and merge the remote changes
hint: (e.g. 'git pull') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.