1
git remote -v

1
git remote set-url origin https://github.com/huangzy-hub/ESP32S3.git
2
git remote set-url upstream https://github.com/it-cc/ESP32S3.git

1
git branch                # 查看所有分支
2
git checkout main          # 切回主分支
3
git checkout my-dev        # 切到你的分支
4
git checkout -b my-dev     # 创建并切换新分支

1
git status    # 看哪些文件被修改
2
git diff      # 看具体改了什么内容

1
git add .
2
git commit -m "完成功能修改"

1
git merge --abort
2
git fetch upstream
3
git reset --hard upstream/main
4
git clean -fd

1
git merge my-dev

1
# 1. 同步原项目最新代码
2
git checkout main
3
git pull upstream main
4

5
# 2. 创建自己的分支
6
git checkout -b my-dev
7

8
# 3. 写代码 → 提交
9
git add .
10
git commit -m "修改完成"
11

12
# 4. 推到自己仓库备份
13
git push origin my-dev
14

15
# 5. 合并并推到原项目
16
git checkout main
17
git pull upstream main
18
git merge my-dev
19
git push upstream main