git异常 报错

Hint: your next pull:

Hint:

Hint: git config pull.rebase false # merge

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.

打开命令提示符，输入git config pull.rebase false

执行完命令，重新拉取、提取，会提示冲突，然后手动解决冲突，在提交就OK了。