visual studio git 拉取冲突解决

visual studio git 拉取冲突解决：

1、git pull 拉取–出现冲突；
2、删除冲突注释并保存（删除你想要删除的代码及冲突注释），，注释样例如 “<<<<<<< HEAD 冲突的代码 =======>>>>>>> 0effc28b8c541c863e972b6268498304409b9e4d”；
3、git stash ,输入命令正常有冲突文件提示，如：冲突文件.cs: needs merge；
4、git add .
5、git commit -m “Resolved merge conflict by incorporating both suggestions.” 输入命令正常有冲突文件提示，如：[master e03a382] Resolved merge conflict by incorporating both suggestions.，
6、重新推送 git push

"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\cmd\git.exe"  stash
"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\cmd\git.exe"  add .
"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\cmd\git.exe"  commit -m "Resolved merge conflict by incorporating both suggestions."

Git报错解决：OpenSSL SSL_read: Connection was reset, errno 10054 错误解决：
OpenSSL SSL_read: Connection was reset, errno 10054

函数上方 显示调用引用 ： 工具→选项→文本编辑器→所有语言→CodeLens→ 启用CodeLens