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
对应的三个方案:merge
:最普遍的方式,拉下来解决冲突rebase
:使用变基方式,不会产生无用 commitfast-forward
:快进方式,只拉取没有冲突的