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
Read More:
- git push error failed to push some refs to solution
- Git push you are not allowed to upload merges
- How to Fix GIT Push Error
- Using the pit in Git that rebase encountered two could not apply XXXX
- How to use vimdiff to solve conflict?
- pathspec ‘master’ did not match any files known to git
- Pull is not possible because you have unmerged files. Please, fix them up in the work tree, and then
- Git solves pull origin error: the following untracked working tree files would be rewritten by merge
- error: src refspec master does not match any error:failed to push some refs to ‘[email protected]:xxxx
- Error: failed to push some refs to ‘xxx’
- [Git & GitHub] Solution: error: failed to push some refs to’https://github.com/xxxx.git’
- How to solve error: failed to push some refs to ‘[email protected]:……git pull conflict
- [FAQ] after git merge, the push to Gerrit fails, indicating no new changes?
- JS error: unexpected token u in JSON at position 0
- Permission denied error: unable to index file .vs/Trip2015/v15/Server/sqlite3/db.lock fatal: adding
- Git failed to submit data error: failed to push some refs to’https://github.com/XXXXXXX/gif.git’
- gerrit error: missing Change-Id in commit message footer
- Git pull undo misoperation
- Failed to push some refs to
- Git uploads local IntelliJ idea project to GitHub