学新通技术网

git pull 的时候出错提示 'Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch'

Yonggie 1708 1
git pull 的时候出错提示 'Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch'

1. 错误描述

hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before 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.

2. 错误原因

     当前文件的branch和要pull的branch名字不一样,是两个分支。对于两个branch,git不能直接操作,需要你指定什么操作。

3. 修改错误-复制到命令行,回车执行就可以了

git config --global pull.rebase false  # merge (the default strategy)
git config --global pull.rebase true   # rebase
git config --global pull.ff only       # fast-forward only

 

本文出至:学新通技术网

标签: