git解決合并沖突

找到沖突檔案然後可以手動解決沖突

1.先git add .

2.git commit -m ‘1212’

3.然後先git pull 再 git push 就可以了

參考：https://blog.csdn.net/nonfuxinyang/article/details/77206486

https://backlog.com/git-tutorial/cn/stepup/stepup2_7.html

https://blog.csdn.net/u012150179/article/details/14047183