解决git未指定冲突处理方法的问题 - hint: Pulling without specifying how to reconcile divergent branches ishint: di(
Posted Rudon滨海渔村
tags:
篇首语:本文由小常识网(cha138.com)小编为大家整理,主要介绍了解决git未指定冲突处理方法的问题 - hint: Pulling without specifying how to reconcile divergent branches ishint: di(相关的知识,希望对你有一定的参考价值。
解决办法
git config pull.rebase false
rudon@vmu:/var/www/$ 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.
rudon@vmu:/var/www/$ git config pull.rebase false
rudon@vmu:/var/www/$ git pull
Already up to date.
rudon@vmu:/var/www/$
以上是关于解决git未指定冲突处理方法的问题 - hint: Pulling without specifying how to reconcile divergent branches ishint: di(的主要内容,如果未能解决你的问题,请参考以下文章
git stash pop 冲突,git stash list 中的记录不会自动删除的解决方法