Github分支合并冲突解决

。。。

参考文档：

https://docs.github.com/cn/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github

标签：pull,addressing,github,merge,Github,冲突,requests,分支
来源： https://www.cnblogs.com/ezgod/p/16403346.html