常说的先拉再推,先pull再push
遇到问题:
! [rejected] dev-fl -> dev-fl (non-fast-forward)
error: failed to push some refs to ‘....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 add 和 git commit 已经执行成功
git status (显示个人分支),下面依次执行下面三个
git pull origin master
git pull origin dev
git push origin dev-fl
分支推送成功。