Git代码拉取提示失败一般解决过程
git stash(备份当前的工作区的内容,保存到git栈)
git pull
git stash pop (从Git栈中读取最近一次保存的内容)
第一步的报错
PS D:\test> git pull
remote: Enumerating objects: 47, done.
remote: Counting objects: 100% (39/39), done.
remote: Compressing objects: 100% (23/23), done.
Unpacking objects: 100% (23/23), 1.95 KiB | 1024 bytes/s, done.
From https://e.coding.net/****
1a78cb8..30d8744 ****-dev -> origin/****-dev
error: Your local changes to the following files would be overwritten by merge:
~~src/assets/scss/modules/home.scss~~
~~src/views/modules/hometemplate/hot-event.vue~~
Aborting
Updating 1a78cb8..30d8744
喊了新来的不pull直接commit和push的同事,让他把代码回退到他有用提交的版本,再推送
回退命令 git reset --hard HEAD
他推送完 我再执行一次git pull,还是报错
第二步的报错
PS D:\test> git pull
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.
接着执行命令:
git stash(备份当前的工作区的内容,保存到git栈)
git pull
git stash pop (从Git栈中读取最近一次保存的内容)
到这里 重新执行普通的pull->commit -> push 就成功了