Git/SourceTree 解決冲突 Please commit your changes or stash them before you merge