bash

git remote add upstream https://github.com/Kele-Bingtang/vitepress-theme-Teek.git

bash

git remote -v

# 输出示例：
$ git remote -v
upstream        https://github.com/Kele-Bingtang/vitepress-theme-Teek.git (fetch)
upstream        https://github.com/Kele-Bingtang/vitepress-theme-Teek.git (push)
vitepress-theme-Teek-hyde     https://gitee.com/SeasirHyde/vitepress-theme-Teek-hyde.git (fetch)
vitepress-theme-Teek-hyde     https://gitee.com/SeasirHyde/vitepress-theme-Teek-hyde.git (push)

bash

git fetch upstream
# 输出示例：
$ git fetch upstream
remote: Enumerating objects: 5323, done.
remote: Counting objects: 100% (2430/2430), done.
remote: Compressing objects: 100% (1497/1497), done.
remote: Total 5323 (delta 1359), reused 1858 (delta 853), pack-reused 2893 (from 1)
Receiving objects: 100% (5323/5323), 11.80 MiB | 739.00 KiB/s, done.
Resolving deltas: 100% (3257/3257), done.
From https://github.com/Kele-Bingtang/vitepress-theme-Teek
 * [new branch]      master     -> upstream/master

bash

git merge upstream/master --allow-unrelated-histories

注意

• 解决可能出现的代码冲突（如果有的话）

• 用编辑器手动解决冲突文件

• 标记冲突已解决： git add <冲突文件>

• 完成合并： git commit -m "merge upstream changes"

bash

git push origin master

注意

• 如果之前已经添加过名为 upstream 的远程源，请跳过步骤 1
• 实际分支名称可能是 master 而非 main ，请根据仓库实际情况替换
• 建议在合并前使用 git status 确认当前分支状态
• 推荐使用 git pull --rebase upstream/main 代替步骤 3 中的普通合并，可以保持提交历史更整洁