Skip to content
Gains Summary
Main Navigation 首页 / Home
C++ 编程 / C++ Programming
系统与高性能 / Systems & Performance
Web 开发 / Web Development
人工智能 / Artificial Intelligence
工业软件 / Industrial Software
其他内容 / Other Topics
C++ 编程 / C++系统与性能 / SystemsWeb 开发 / Web人工智能 / AI工业软件 / Industrial

外观

Sidebar Navigation

← 其他内容 / Other Topics

事故复盘 / Incident Reviews

Git 复盘 / Git Reviews

1. Git 添加 Gitee 远程仓库操作记录 / Adding a Gitee Remote Repository with Git

2. 分支事故复盘：基线分支选错，以及如何用 Cherry-pick 补救 / Branch Incident Review and Recovery with Cherry-Pick

本页目录

Git 添加 Gitee 远程仓库操作记录 / Adding a Gitee Remote Repository with Git ​

1. Computer-World_Frame 仓库 ​

1.1 分支操作 ​

bash
# 查看 main 和 dev 分支的 commit 差异
git rev-list --left-right --count main...dev
# 输出: 29      57

# 切换到 main 分支
git checkout main

# 创建新分支 code-review-test
git checkout -b code-review-test

# 切回 main 分支
git checkout main

# 拉取远程更新
git pull origin main

# 删除本地分支
git branch -d code-review-test

# 查看所有分支
git branch
# codeComments
# dev
# * main
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24

1.2 添加 Gitee remote (main 分支) ​

bash
# 查看当前 remote
git remote -v
# origin  git@github.com:Tidenflow/Computer-World_Frame.git (fetch)
# origin  git@github.com:Tidenflow/Computer-World_Frame.git (push)

# 添加 Gitee push remote
git remote set-url --add --push origin git@gitee.com:J2023201216/computer-world_-frame.git

# 再次添加 GitHub push remote
git remote set-url --add --push origin git@github.com:Tidenflow/Computer-World_Frame.git

# 推送到 Gitee
git push
# * [new branch]      main -> main

# 切换到 dev 分支
git checkout dev
git push
# * [new branch]      dev -> dev
# 提示创建 PR: https://gitee.com/J2023201216/computer-world_-frame/pull/new/J2023201216:dev...J2023201216:main
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20

2. Daily-Plan 仓库 ​

添加 Gitee remote ​

bash
git remote -v
# origin  git@github.com:Tidenflow/Daily-Plan.git (fetch)
# origin  git@github.com:Tidenflow/Daily-Plan.git (push)

# 添加 Gitee push remote
git remote set-url --add --push origin git@gitee.com:J2023201216/daily-plan.git

# 再次添加 GitHub push remote
git remote set-url --add --push origin git@github.com:Tidenflow/Daily-Plan.git

# 推送到 Gitee
git push
# * [new branch]      main -> main
1
2
3
4
5
6
7
8
9
10
11
12
13

3. Tidenflow 仓库 ​

添加 Gitee remote 并处理冲突 ​

bash
# 添加 Gitee push remote
git remote set-url --add --push origin git@gitee.com:J2023201216/tidenflow.git

# 添加 GitHub push remote
git remote set-url --add --push origin git@github.com:Tidenflow/Tidenflow.git

# 首次推送失败 (远程有更新)
git push
# ! [rejected]        main -> main (fetch first)

# 再次尝试
git push
# 同样被拒绝

# 先拉取远程更新
git pull
# Fast-forward
#  README.md      | 113 +...
#  dist/snake.svg |   2 +-
# 2 files changed, 75 insertions(+), 40 deletions(-)

# 再次推送
git push
# 4900e7b..a5446ce  main -> main
# ssh: connect to host github.com port 22: Connection timed out (GitHub 推送失败)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25

4. Agent_Lab_TS 仓库 ​

bash
# 添加 Gitee remote
git remote set-url --add --push origin git@gitee.com:J2023201216/agent_-lab_-ts.git
git remote set-url --add --push origin git@github.com:Tidenflow/Agent_Lab_TS.git

# 推送成功
git push
# * [new branch]      main -> main

# GitHub 推送失败
# Connection reset by 20.205.243.166 port 22
1
2
3
4
5
6
7
8
9
10

5. TS_study 仓库 ​

bash
# 添加 Gitee remote
git remote set-url --add --push origin git@gitee.com:J2023201216/ts_study.git

# 再次添加 GitHub push remote
git remote set-url --add --push origin git@github.com:Tidenflow/TS_study.git

# 推送成功
git push
# * [new branch]      main -> main
1
2
3
4
5
6
7
8
9

6. Cpp_study 仓库 ​

bash
# 添加 Gitee remote
git remote set-url --add --push origin git@gitee.com:J2023201216/cpp_study.git
git remote set-url --add --push origin git@github.com:Tidenflow/Cpp_study.git

# 推送成功
git push
# * [new branch]      main -> main

# GitHub 推送失败
# Connection reset by 20.205.243.166 port 22
1
2
3
4
5
6
7
8
9
10

7. mySkill 仓库 ​

bash
# 添加 Gitee remote
git remote set-url --add --push origin git@gitee.com:J2023201216/my-skill.git

# 添加 GitHub push remote
git remote set-url --add --push origin git@github.com:Tidenflow/mySkill.git

# 推送成功
git push
# * [new branch]      main -> main

# GitHub 推送失败
# Connection reset by 20.205.243.166 port 22
1
2
3
4
5
6
7
8
9
10
11
12

8. Gains-Summary 仓库 ​

bash
# 查看状态
git status
# On branch main
# Your branch is ahead of 'origin/main' by 1 commit.

# 查看 remote
git remote -v
# origin  git@github.com:Tidenflow/Gains-Summary.git (fetch)
# origin  git@github.com:Tidenflow/Gains-Summary.git (push)

# 推送
git push
# 885db14..e08c036  main -> main
1
2
3
4
5
6
7
8
9
10
11
12
13

总结 ​

成功推送到 Gitee 的仓库 ​

仓库状态
Daily-Plan✅ 推送成功
Computer-World_Frame✅ main/dev 分支都推送成功
Tidenflow✅ 推送成功 (需先 git pull)
Agent_Lab_TS✅ 推送成功
TS_study✅ 推送成功
Cpp_study✅ 推送成功
mySkill✅ 推送成功
Gains-Summary✅ 推送成功

遇到的问题 ​

  1. GitHub SSH 连接超时: 部分仓库在推送 Gitee 成功后，推送 GitHub 时出现 Connection timed out 或 Connection reset
  2. 远程有更新: Tidenflow 仓库首次推送被拒绝，需先 git pull 合并远程更新

最后更新于:

Pager
上一篇← 其他内容 / Other Topics
下一篇2. 分支事故复盘：基线分支选错，以及如何用 Cherry-pick 补救 / Branch Incident Review and Recovery with Cherry-Pick

持续记录，持续成长

Copyright © Tidenflow