vs git提示: 无法拉取,因为存在未提交的更改。请提交、储藏或澈消更改,然后重试。有关详细信息,请查看输出窗口。
查看输出窗口提示:
正在从 origin 提取
正在推送 master
Warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
commands sometime before your next pull:
git config pull.rebase false # merge (the default strategy)
git config pull.rebase true # rebase
git config pull.ff only # fast-forward only
You can replace "git config" with "git config --global" to set a default
preference for all repositories. You can also pass --rebase, --no-rebase,
or --ff-only on the command line to override the configured default per
invocation.
91bd65d 啊
virtual bc8b2abc7fcad7da5c1258fa51ac91fdf7d2f4b2
拉取操作会覆盖以下 67 个文件的本地更改:
xxx
...
解决:
cmd进入项目目录执行
git pull --rebase
之后再推送
作者:xuejianxiyang
出处:http://xuejianxiyang.cnblogs.com
关于作者:Heaven helps those who help themselves.
本文版权归原作者和博客园共有,欢迎转载,但未经原作者同意必须保留此段声明,且在文章页面明显位置给出原文连接,否则保留追究法律责任的权利。