! [rejected] master -＞ master (non-fast-forward)error: failed to push some refs to ‘https:/

 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://e.coding.net/g-gosv1888/Admin_Study/zhitongxinnengyuan.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操作

解决办法：
git pull --rebase origin master

再

git push --set-upstream origin master