Git在idea中的操作,有图做解释

红太狼 2024-05-04 08:01 65阅读 0赞

## Git分布式项目管理工具规则 ##

*  先拉取、编码、提交
 *  拉取后只要是写了代码，就要提交，不可以先写代码再拉取更新。
 *  如果有冲突，写了代码之后先提交，再解决冲突  
    创建码云仓库1  
    ![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center]

## Git使用步骤 ##

### git公钥的生成，把公钥给项目经理 ###

![在这里插入图片描述][20200613104443389.png_pic_center]  
打开之后运行命令：ssh-keygen -t rsa  
![出现此页面表示运行成功][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 1]

### 在本地找公钥 ###

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 2]

### 加载公钥到服务 ###

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 3]

### 文件上传（项目经理） ###

#### 项目上传图解 ####

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 4]

#### 打开idea创建git仓库 ####

#### 代码先提交本地仓库（暂存区）先add 再commit ####

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 7]

#### 提交本地 ####

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 8]

*  提交本地时注意清除掉编译信息  
    ![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 9]

#### 上传本地后，先连接码云 ####

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 10]

##### 将码云信息填写到IDEA #####

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 11]

##### 在idea中连接码云 #####

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 12]

#### 上传代码 ####

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 13]

### 代码拉取（程序员） ###

#### 复制经理代码下载路径 ####

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 14]

#### 代码拉取 ####

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 15]

#### 重新起一个项目名称 ####

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 16]

### 提交代码== 提交选文件、更新选项目 ###

#### 要提交的代码先提交本地 ####

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 17]  
![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70]  
![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70 1]

### 拉取代码每天在写代码之前先拉取、更新代码；拉代码：要选中项目后pull ###

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 18]

### 起冲突了会提示合并，提交自己有把握的代码，先提交本地 ###

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70 2]

### 代码起冲突了会提示合并 ###

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70 3]

### 解决冲突（和另一方代码作者协商） ###

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 19]

### 创建分支：右键项目选择分支 ###

#### 分支的作用：单独跑工具类测试等… ####

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70 4]  
![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70 5]

#### 效果 (书签在分支V1上面) ####

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 20]

### 主线和平分支的步骤 ###

#### 主线、分线切换 ####

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70 6]

#### 主线+分支合并的方法:分支要想往主线合并，先处在主线上，然后合并选择分支，切回主线后右键分支执行这个操作，合并。 ####

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70 6]

#### 删除分支 ####

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70 7]  
本篇为自己经验，如有不足之处望说明。  
如果对你有帮助，还望点个赞。

--------------------

1.  方便后面使用 ↩︎

[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/7289a9bec6014842a643cd9be519bb60.png
[20200613104443389.png_pic_center]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/0f86f12b746f4d579e85879c674e03a1.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 1]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/171564fc2ebc42ecba6fc46fea7d98a9.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 2]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/3984da9b39c640ee98043a5559319fe0.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 3]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/13213db698684205ad3594c1ee5442ec.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 4]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/a741206d90f746138889026580c82480.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 5]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/5b5d0937e3304a2bbff7c3b845bfc59c.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 6]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/699213202cbc4b2181667c7e49687284.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 7]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/6eb45761ae54475fbfa5dffbf6d6700d.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 8]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/598b1522a72d44acb457d9896086175e.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 9]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/7bb81cac23b44e5da489b32ed10fda81.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 10]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/5150f029ce3f4d7296ad6fc32c3c866a.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 11]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/73407eb057664d44b3b70384099ffeaf.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 12]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/6474041738194725ae0558677f85713f.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 13]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/165c3a17bb9943ba9632d8e051f52ae7.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 14]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/ad3030d0f96549b6b22ffe65e9f6756e.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 15]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/7e0a6bb96854415dbc86558713468f8d.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 16]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/737fb6eb94b24607ad64f34cda941f63.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 17]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/a9c4c4ffeefb4e1b9115411bb1fb7833.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/f33790a8655847b5bec668aeab845ad2.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70 1]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/2949552566f142acaf1c2c09028e7f5b.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 18]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/c2b04790b3b54741bc110288d0b6e746.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70 2]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/15067f3f60e54d3fb58e7117f90e0dc4.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70 3]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/4b3f8069ac574e85b07c17e307288a24.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 19]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/623493cdb77d4e5e86216a58ae8b0db7.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70 4]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/419f9bc9d5bf435fb29ea0ba732ebf1d.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70 5]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/ed31e67c95b94c639edddaf5d96d8234.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70_pic_center 20]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/9685c2e45fba4e18a5c0e51d8d91869c.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70 6]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/4464faa04cd14021b7f02da2c8b00329.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl80NjEyODk0Mg_size_16_color_FFFFFF_t_70 7]: https://image.dandelioncloud.cn/pgy_files/images/2024/05/04/2fd930d920f144b3bc8cd967b461d16d.png