Your local changes would be overwritten by merge. Commit, stash or revert them to proceed的解决方法