添加上游仓库

git remote add upstream https://gitee.com/spark-store-project/spark-store.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)
upstream        https://gitee.com/spark-store-project/spark-store.git (fetch)
upstream        https://gitee.com/spark-store-project/spark-store.git (push)

获取上游更新

git fetch upstream

合并上游主分支更新

git checkout master git merge upstream/master

错误解决：

致命错误：您尚未结束您的合并（存在 MERGE_HEAD）。 请在合并前先提交您的修改。取消当前合并（安全回退）

解决方案：git merge --abort

强制清理：git reset --merge

回退到某提交ID：git checkout e49f4baa87eb8f3adba1616ce018765faeb90d9d