PC2台(windows、Mac)で開発中。
最初はMacで開発し、途中からはほぼWindowsで開発
Macでgit pull した時に下記のようなエラーがでる。
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: 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.
fatal: Need to specify how to reconcile divergent branches.
以下の 3 つの設定のうち、いずれかを実施すれば、 warning は出なくなる。
git config pull.rebase false
git config pull.rebase true
git config pull.ff only
git config --global pull.rebase false
を打つことで解決