git中的错误

! [rejected]        master -> master (non-fast-forward)

error: failed to push some refs to 'git@gitee.com:march_weishen/yk.git'

hint: Updates were rejected because the tip of your current branch is behind

hint: its remote counterpart. Integrate the remote changes (e.g.

hint: 'git pull ...') before pushing again.

hint: See the 'Note about fast-forwards' in 'git push --help' for details.

 

首先：git pull --rebase origin master

然后：git push origin master