Git add -u filename git add -u filename git rebase — continue git rebase — continue git rebase — continue git rebase — continue git rebase — continue git add -u filename Commit is not required. And then finally, code. (reference links reference 2)

the cause of the problem: in the local branch ahead remote branch commit more than one, is the bifurcate, in this case, use the git pull after updating the code to git push will have such a situation,

solution principles: use rebase, “give up” the local patches, but is saved and then add in the front of the remote branch.

base parse link
Attached is a blog post with a lot of git error parsing: click the Open link