git push 失败的解决办法

有时候git push会报错：
git push origin luoyan-dev:luoyan-dev

To [email protected]:xxx.git
! [rejected] luoyan-dev -> luoyan-dev (non-fast-forward)
error: failed to push some refs to ‘[email protected]:xxx.git’
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. ‘git pull’) before pushing again. See the
‘Note about fast-forwards’ section of ‘git push –help’ for details.

解决办法：
git fetch origin luoyan-dev:luoyan-dev-temp
git merge luoyan-dev-temp
git push origin luoyan-dev:luoyan-dev