git在push时non-fast-forward 或 fetch first报错解决

git在push时的错误：non-fast-forward 或 fetch first 原因是当前的分支过期了，所以需要将本地的与远程的整合，之后再推。

 ! [rejected]        liguangda -> liguangda (fetch first)
 或 ! [rejected]        liguangda -> liguangda (non-fast-forward)

1.拉取远程分支 liguangda

git fetch origin liguangda

2.合并远程分支

git merge origin debug

3.更新本地分支

git pull origin liguangda

4.再push

git push origin liguangda