idea git pull失败小记

错误信息

2:55 PM Git Pull Failed
POST git-upload-pack (xxx bytes)
POST git-upload-pack (xxx bytes)
remote: Enumerating objects: xxx, done.
remote: Total xx (delta xx), reused xxx (delta x)
From xxxxx
* branch fxxxx -> FETCH_HEAD
* branch master -> FETCH_HEAD
= [up to date] xxxx -> origin/xxxxx
xxxxx master -> origin/master
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 reposito… (show balloon)

解决问题

看提示，设置：git config pull.rebase false即可
或者全局设置： git config --global pull.rebase false