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.
应该选择哪个作为默认的行为?
这个的意思是,你在
pull
时遇到冲突的时候,使用那种合并方式:merge
:最普遍的方式,拉下来解决冲突rebase
:使用变基方式,不会产生无用 commitfast-forward
:快进方式,只拉取没有冲突的我门团队的方式是使用第二种
rebase
的方式,具体好处可以参考我的文章:前端架构师的 git 功力,你有几成火候?