Git合并冲突——both modified解决

git mergetool

参考地址:https://blog.csdn.net/wawawakaokao/article/details/124331696