成为git砖家(12): 看懂git合并分支时冲突提示符

拉取远程更新并合并到本地当前分支时，遇到冲突：

git pull --rebase

查看冲突的文件 git/.gitconfig.d/basic:

# buffer size
[http]
    postBuffer = 1048576000 # 1GB, default is 1MB
<<<<<<< HEAD

[url "git@github.com:"]
    insteadOf = "gh:"
=======
# Use work-username and work-email for company related repos
# by using conditional config, requires git >= 2.12
[includeIf "hasconfig:remote.*.url:https://*.company.com.cn/**"]
    path = .gitconfig-company

>>>>>>> c070ce0 ([misc] ...)

或者，用 VSCode 查看（已经安装了 gitlens 插件):

格式说明：

<<<<<<< HEAD
本地当前分支的内容
=======
要合并进来的commit涉及的修改内容
>>>>>>>