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