IDEA中使用git合并分支的过程报错:cant checkout because of unmerged files
https://www.cnblogs.com/yunjiandubu/p/10927329.html
