Git冲突:commit your changes or stash them before you can merge. 解决办法 https://www.cnblogs.com/wenlj/p/5866356.html