问题1: error: The following untracked wonking tree files would be overwritten by merge: 解决办法: git clean -d -fx