操作命令: //执行这两条命令cd / git config --global credential.helper store 执行完命令之后会在.gitconfig文件中多加红色字体 [user] name = your name email = your email [credential] helper = store 使用: cd到项目目录,执行git pull,会提示输入账号密码.输完这一次以后git pull或git push就不在需要输入密码了(会在根目录生成一个 .git-cre
Your local changes to the following files would be overwritten by mergeerror: Your local changes to the following files would be overwritten by merge: protected/config/main.phpPlease, commit your changes or stash them before you can merge. 参考http://b