resolvent:
1. Do not keep your own code, as long as the server’s code
git reset –hard
git pull origin master
2. Keep your own code
git stash
git pull origin master
git stash pop
Read More:
- [Solved] git Error: error: Your local changes to the following files would be overwritten by merge
- Git Pull Error:The following untracked working tree files would be overwritten by merge
- [Solved] Git pull error: cannot pull with rebase: Your index contains uncommitted changes.
- git error: The following untracked working tree files would be overwritten by checkout
- Git pull and Git pull origin master Warning: Pulling without specifying how to reconcile divergent branches
- Git: How to Solve Error: Please commit your changes or stash them before you merge.
- [Solved] Git Error: fatal: refusing to merge unrelated histories
- Git Error: refusing to merge unrelated histories [How to Solve]
- Local repository upload to remote repository error: failed to push some refs to ‘https://hub.fastgit.org/zhizhangxuezhang/ui-test.git‘
- Git Pull Error: RPC failed; curl 56 OpenSSL SSL_read: SSL_ERROR_SYSCALL, errfno 10054
- [Solved] error: failed to push some refs to ‘https://gitee.com/wangdxstudy/mygirl.git‘
- How to Solve Git Error: error: failed to push some refs to……
- [Solved] Git error: inflate: data stream error (invalid block type) error: corrupt loose object
- [Solved] Git Error: fatal: refusing to merge unrelated histories
- Git pull code error fatal: authentication failed fo
- Git Push Error: failed to push some refs to ‘[email protected]:
- [Solved] IDEA Git Update Error: Master has no tracked branch
- [Solved] Git submits locally to the remote warehouse Error: failed to push some refs to…
- [Solved] Doris StreamLoad Error: load by MERGE or DELETE need to upgrade table to support batch delete
- Git under Windows reports an error: warning: LF will be replaced by CRLF in ××××.××