添加上游仓库

git remote add upstream https://gitee.com/spark-store-project/Spark-Update-Tool.git

查看

momen@momen-ASUS:~/Desktop/momen-clone/spark-store$ git remote -v
origin  https://gitee.com/momen_official/spark-store.git (fetch)
origin  https://gitee.com/momen_official/spark-store.git (push)
spark-update-tool       https://gitee.com/spark-store-project/Spark-Update-Tool.git (fetch)
spark-update-tool       https://gitee.com/spark-store-project/Spark-Update-Tool.git (push)
upstream        https://gitee.com/spark-store-project/spark-store.git (fetch)
upstream        https://gitee.com/spark-store-project/spark-store.git (push)

获取上游dev更新

git fetch spark-update-tool dev git merge spark-update-tool/dev

把远程代码合并到你的本地目录

git subtree pull --prefix=Spark-Update-Tool spark-update-tool dev

git subtree pull --prefix=Spark-Update-Tool spark-update-tool dev --squash不保留远程提交日志）

强制保留远程修改

git reset --hard Spark-Update-Tool/dev