Git提交代码冲突：commit your changes or stash them before you can merge.