最近把 git 升級到 2.27 版
1 2 $ git version git version 2.27.0 執行 git pull 指令時,會跳出一篇警告
1 2 3 4 5 6 7 8 9 10 11 12 13 $ git pull 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. 大致上是要你決定在 pull 遇到分支衝突的處理方式。
...