详解Git合并冲突——原因及解决 “Automatic merge failed； fix conflicts and then commit the result.“