1：异常现象
推送有冲突的git修改到远端的时候，会有如下提示
git.exe push --progress "origin" master:master
To http://gitlab.xxx.com/dujunqiu/test.git
! rejected master -> master (fetch first)
error: failed to push some refs to 'http://gitlab.xxx.com/dujunqiu/test.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
git did not exit cleanly (exit code 1) (1172 ms @ 2024/3/9 15:59:25)
2：修改方式
注意这里需要将VSCODE版本更新为1.8x；1.7x的版本可能不支持 GitLens;
安装如下两个插件
直接把 远端合并有冲突的分支拉取一下
本地就会显示有冲突提示了
选择 "在合并编辑器中解析"；根据界面提示，选择左侧或者右侧的内容之后，点击 "完成合并"
此时再push到git就不会有合并冲突了