因为队友在git仓库中进行了修改,所以我在本地代码库修改之后git pull会报错。
注意:git pull = git fetch + git merge
Your local changes would be overwritten by merge. Commit, stash or revert them to proceed.
解决方法1:
git stash //储存本地的修改
git pull
git unstash
因为队友在git仓库中进行了修改,所以我在本地代码库修改之后git pull会报错。
注意:git pull = git fetch + git merge
Your local changes would be overwritten by merge. Commit, stash or revert them to proceed.
解决方法1:
git stash //储存本地的修改
git pull
git unstash