如何解决Pulling without specifying how to reconcile divergent branches

本文转载自查看原文 2021-06-10 16:02 6609 [17]GIT/ [00]Mac

% git pull
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.
Already up to date.

执行下面的配置，

% git config --global pull.ff only

免责声明！

本站转载的文章为个人学习借鉴使用，本站对版权不负任何法律责任。如果侵犯了您的隐私权益，请联系本站邮箱yoyou2525@163.com删除。

猜您在找 Git问题解决：warning: Pulling without specifying how to reconcile divergent branches is discouraged. 【Github】Git问题解决：warning: Pulling without specifying how to reconcile divergent branches is discouraged. You git pull和git pull origin master报如下警告Pulling without specifying how to reconcile divergent branches Git问题解决方案:不建议在没有为偏离分支指定合并策略时执行pull操作(Pulling without specifying how to reconcile divergent branches) 关于Django Specifying a namespace in include() without providing an app_name 'Specifying a namespace in include() without providing an app_name ' django.core.exceptions.ImproperlyConfigured: Specifying a namespace in include() without providing Starting MySQL. ERROR! The server quit without updating PID file如何解决 django.core.exceptions.ImproperlyConfigured: Specifying a namespace in include() without providing an app_name is not supported. Django:django.core.exceptions.ImproperlyConfigured: Specifying a namespace in include() without providing an app_name is not supported.