查看输出窗口提示:
正在从 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
之后再推送