git 提交代码出现错误提示
Your branch and ‘origin/xxx’ have diverged,
and have 1 and 1 different commits each, respectively.
(use “git pull” to merge the remote branch into yours)
All conflicts fixed but you are still merging.
(use “git commit” to conclude merge)
一. 不保存本地修改
git fetch origin
git reset --hard origin/master
二.需要提交本地修改
git commit (看提示)
git rebase origin/xxx
git pull
git push