git checkout dev
git pull
git checkout dev-szx
git merge dev
如果pull的过程中报错:error: The following untracked working tree files would be overwritten by merge
先将本地内容删除:git clean -f
git checkout dev
git pull
git checkout dev-szx
git merge dev
如果pull的过程中报错:error: The following untracked working tree files would be overwritten by merge
先将本地内容删除:git clean -f