git pull问题 git config pull.rebase false

错误如下:

Unable to pull because your local and remote branches changed.
Set your preferred Git behavior for how to reconcile diverged branches in Git settings.
git: 'credential-manager' is not a git command. See 'git --help'.
The most similar command is
    credential-manager-core
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
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.

执行下红色字体就可以了

posted @ 2022-09-20 17:34  vba是最好的语言  阅读(2957)  评论(0编辑  收藏  举报