首页 > 其他 > 详细

git pull和git pull origin master报如下警告Pulling without specifying how to reconcile divergent branches

时间:2021-06-03 23:40:21      阅读:340      评论:0      收藏:0      [点我收藏+]

技术分享图片

 

 

git pull和git pull origin master报如下警告

hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint: 
hint: git config pull.rebase false # merge (the default strategy)
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint: 
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.

解决办法:

$ git config pull.ff false
$ git config --global pull.rebase false

git pull和git pull origin master报如下警告Pulling without specifying how to reconcile divergent branches

原文:https://www.cnblogs.com/rxbook/p/14846518.html

(0)
(0)
   
举报
评论 一句话评论(0
关于我们 - 联系我们 - 留言反馈 - 联系我们:wmxa8@hotmail.com
© 2014 bubuko.com 版权所有
打开技术之扣,分享程序人生!