Git冲突：commit your changes or stash them before you can merge.

https://blog.csdn.net/lincyang/article/details/21519333