git Sourcetree 报错

Question

有没有大佬可以帮忙看下,上传就出错,其他分支没有这个问题

git -c diff.mnemonicprefix=false -c core.quotepath=false --no-optional-locks push -v --tags --set-upstream origin master:master
Pushing to ssh://192.168.0.94:7003/national-center/front-end/practice.git
To ssh://192.168.0.94:7003/national-center/front-end/practice.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'ssh://192.168.0.94:7003/national-center/front-end/practice.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.

Answer 1

报错是让你git pull先更新下代码，有冲突解决冲突没冲突就可以正常push了