wxin/CI-CD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新 版本控制.md

Browse Source
This commit is contained in:
wxin 2025-04-23 13:09:46 +08:00
parent 72c1eca92e
commit eeb661f1d4
1 changed files with 434 additions and 434 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
版本控制.md
View File

@ -19,7 +19,7 @@
5. 提交修改
6. 在修改完成后，如果发现错误，可以撤回提交并再次修改并提交
![](accents\image-202504220001.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220001.png)
### 3. git 的工作区、暂存区和版本库
@ -29,7 +29,7 @@
**版本库：**工作区有一个隐藏目录`.git`，这个不算工作区，而是`Git`的版本库
![](accents\image-202504220002.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220002.png)
### 4. Git 安装
@ -169,19 +169,19 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTniLfB2SsuRFonPOD94/uCyc8x/wSgkmW0Jq8eRoF
`Github`添加`Git`服务器秘钥：
![](accents\image-202504220003.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220003.png)
![](accents\image-202504220004.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220004.png)
![](accents\image-202504220005.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220005.png)
![](accents\image-202504220006.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220006.png)
![](accents\image-202504220007.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220007.png)
![](accents\image-202504220008.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220008.png)
![](accents\image-202504220009.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220009.png)
`git`服务器上创建项目并上传到`github`：
@ -229,9 +229,9 @@ To git@github.com:wxin712/wxin_cloud.git
`github`查看：
![](accents\image-202504220010.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220010.png)
![](accents\image-202504220011.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220011.png)
注意：这样上传到`github`的分支不能跟`main`分支合并
@ -267,7 +267,7 @@ remote: To git@github.com:wxin712/wxin_cloud.git
查看结果：
![](accents\image-202504220012.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220012.png)
```bash
# 查看命令历史，以便确定要回到哪个版本
@ -294,7 +294,7 @@ remote: To git@github.com:wxin712/wxin_cloud.git
查看结果：
![](accents\image-202504220013.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220013.png)
### 6. 分支管理
@ -355,39 +355,39 @@ Fast-forward
创建项目：
![](accents\image-202504220014.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220014.png)
![](accents\image-202504220015.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220015.png)
创建分支：
![](accents\image-202504220016.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220016.png)
![](accents\image-202504220017.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220017.png)
![](accents\image-202504220018.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220018.png)
新分支创建文件：
![](accents\image-202504220019.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220019.png)
![](accents\image-202504220020.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220020.png)
![](accents\image-202504220021.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220021.png)
合并分支：
![](accents\image-202504220022.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220022.png)
![](accents\image-202504220023.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220023.png)
![](accents\image-202504220024.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220024.png)
![](accents\image-202504220025.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220025.png)
`main`分支验证是否合并成功：
![](accents\image-202504220026.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220026.png)
### 8. 使用 Github 上的项目
@ -431,4 +431,4 @@ remote: To git@github.com:wxin712/wxin_cloud_test.git
`github`验证：
![](accents\image-202504220027.png)
![](http://182.92.143.66:40072/directlink/img/CI-CD/image-202504220027.png)