git合并出现冲突

git合并出现冲突:
Your local changes to the following files would be overwritten by merge:
Please, commit your changes or stash them before you can merge.
解决方案:
git stash //使返回到自己上一个commit,先隐藏
git pull origin master //拉取最新的代码
git stash pop //回到自己修改的代码

 

 

git pull每次都需要输入账号密码:

git config --global credential.helper store
posted @ 2018-09-29 19:22  何其小静  阅读(1420)  评论(0编辑  收藏  举报