使用git时遇到的坑 non-fast-forward

! [rejected] resume-dev-gu -> resume-dev-gu (non-fast-forward)error: failed to push some refs to 'ssh://[e-mail]:7999/fed/resume.git'hint: Updates were rejected because the tip of your current branch is behindhint: 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

解决办法

1.把远程代码拉下来 git pull origin XXX

2.处理冲突

3.git add   git commit   git push origin XXX