error: switch `m' requires a value"/>
error: switch `m' requires a value
error: switch `m' requires a value
错误:开关“m”需要一个值
解决方法:
输入 git status 后会出现以下
On branch master
Your branch and 'origin/master' have diverged,
and have 1 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
意思是(使用“git pull”将远程分支合并到您的分支中)
All conflicts fixed but you are still merging.
(use "git commit" to conclude merge)
意思是(使用“git commit”结束合并)
Changes to be committed:
modified: index.html
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
意思是(使用“git add<file>…”更新将提交的内容)
(use "git checkout -- <file>..." to discard changes in working directory)
意思是(使用“git checkout——<file>…”放弃工作目录中的更改)
modified: index.html
我的解决方案是 git add index.html
结束合并 git commit -m "modify"
把服务器代码拉下来跟你本地代码合并 git pull
把合并好的最新代码推送到服务器端 git push
2019.7.11
更多推荐
error: switch `m' requires a value
发布评论