# git

**Repository Path**: hrbu2024/git

## Basic Information

- **Project Name**: git
- **Description**: git使用学习
- **Primary Language**: Unknown
- **License**: Not specified
- **Default Branch**: master
- **Homepage**: None
- **GVP Project**: No

## Statistics

- **Stars**: 0
- **Forks**: 0
- **Created**: 2026-07-05
- **Last Updated**: 2026-07-05

## Categories & Tags

**Categories**: Uncategorized

**Tags**: None

## README

# 版本控制工具



CVS

SVN

GIT



[Git课件 (yuque.com)](https://www.yuque.com/jshand/hrbu-edu/eluirmyq4b25sge7)

# 下载安装

http://git-scm.com

![image-20260705083727519](assets/image-20260705083727519.png)

![image-20260705083924371](assets/image-20260705083924371.png)

![image-20260705083941106](assets/image-20260705083941106.png)

![image-20260705084000994](assets/image-20260705084000994.png)

![image-20260705084026277](assets/image-20260705084026277.png)

![image-20260705084044522](assets/image-20260705084044522.png)

![image-20260705084119754](assets/image-20260705084119754.png)

![image-20260705084259731](assets/image-20260705084259731.png)

![image-20260705084505922](assets/image-20260705084505922.png)

![image-20260705084646988](assets/image-20260705084646988.png)

![image-20260705084806580](assets/image-20260705084806580.png)

![image-20260705084857970](assets/image-20260705084857970.png)

![image-20260705084909890](assets/image-20260705084909890.png)

![image-20260705084929177](assets/image-20260705084929177.png)

![image-20260705084939122](assets/image-20260705084939122.png)

## 验证

cmd下执行  

```
git  --version
```

![image-20260705085257672](assets/image-20260705085257672.png)

或者是在右键中出现 

- git bash  
- git gui

![image-20260705085231883](assets/image-20260705085231883.png)

# 常用命令



## 初始化 当前的用户信息

设置为全局

```
git config --global user.name "jshand"
git config --global user.email "zhangjinshan21f@163.com"
```

![image-20260705090707639](assets/image-20260705090707639.png)



# 将代码提交到服务器（Gitee）操作步骤

在代码的根目录右键打开git bash

![image-20260705090917255](assets/image-20260705090917255.png)

## 1 将文件夹交给git 管理

初始化一个仓库

```
git init
```

![image-20260705091055170](assets/image-20260705091055170.png)



## 2 将文件交给git工具进行记录历史

添加到**暂存区**

将源码文件  .java   .md

```
git add .
```



## 3 查看当前仓库的状态

git status 

## 4 提交改动记录

git  commit  -m  'xxxxxx'

```shell
Administrator@WIN-20240903EPN MINGW64 /d/code/git (master)




$ git commit -m '提交一下git笔记'


[master (root-commit) 840763c] 提交一下git笔记
 21 files changed, 130 insertions(+)
 create mode 100644 Readme.md
 create mode 100644 assets/image-20260705083727519.png
 create mode 100644 assets/image-20260705083924371.png
 create mode 100644 assets/image-20260705083941106.png
 create mode 100644 assets/image-20260705084000994.png
 create mode 100644 assets/image-20260705084026277.png
 create mode 100644 assets/image-20260705084044522.png
 create mode 100644 assets/image-20260705084119754.png
 create mode 100644 assets/image-20260705084259731.png
 create mode 100644 assets/image-20260705084505922.png
 create mode 100644 assets/image-20260705084646988.png
 create mode 100644 assets/image-20260705084806580.png
 create mode 100644 assets/image-20260705084857970.png
 create mode 100644 assets/image-20260705084909890.png
 create mode 100644 assets/image-20260705084929177.png
 create mode 100644 assets/image-20260705084939122.png
 create mode 100644 assets/image-20260705085231883.png
 create mode 100644 assets/image-20260705085257672.png
 create mode 100644 assets/image-20260705090707639.png
 create mode 100644 assets/image-20260705090917255.png
 create mode 100644 assets/image-20260705091055170.png





```

查看状态发现已经提交了

![image-20260705091706920](assets/image-20260705091706920.png)



## 5 查看历史轨迹

![image-20260705091810054](assets/image-20260705091810054.png)



## 6 随送到远端仓库

### 6.1 注册giteee

并创建仓库

![image-20260705091904764](assets/image-20260705091904764.png)



### 6.2 创建远端仓库



![image-20260705092053963](assets/image-20260705092053963.png)

![image-20260705092150941](assets/image-20260705092150941.png)

### 6.3 添加远端仓库地址

6.4 推送到远端

```
git remote add origin https://gitee.com/hrbu2024/git.git
git push -u origin "master"

```

![image-20260705092339470](assets/image-20260705092339470.png)

![image-20260705092502170](assets/image-20260705092502170.png)





![image-20260705092442126](assets/image-20260705092442126.png)

### 6.4 提交新的内容

如果只是文件内容变化，没有新增文件,可以直接执行 

git commit  -m 'xxxxx'

git push 







# 演示将项目代码推送到gitee

自己手动创建项目(IDEA)

![image-20260705093948364](assets/image-20260705093948364.png)



## 1 配置身份信息

![image-20260705094056120](assets/image-20260705094056120.png)

## 2 在项目根目录中打开git bash

右键

![image-20260705094130715](assets/image-20260705094130715.png)



![image-20260705094148921](assets/image-20260705094148921.png)



提交代码

## 3 创建仓库

```
git init 
```



![image-20260705094231594](assets/image-20260705094231594.png)

## 4 将文件或者代码交给git的暂存区

```
git add  .
```



![image-20260705094355818](assets/image-20260705094355818.png)

## 5 将修改的内容添加到 git 记录中

```
git commit -m '创建了一个新的项目，加了一个java'
```

![image-20260705094601214](assets/image-20260705094601214.png)

## 6 创建远端仓库

![image-20260705094641634](assets/image-20260705094641634.png)

![image-20260705094710273](assets/image-20260705094710273.png)



![image-20260705105348553](assets/image-20260705105348553.png)

## 7 添加远端仓库的地址，并推送记录



<div style="color:red;font-size:30px"> 不要用我的 自己找下  网站上面的 仓库地址</div>

```
git remote add origin https://gitee.com/jshand/jdbc.git
git push -u origin "master"

```

![image-20260705094928236](assets/image-20260705094928236.png)



push的时候 要求输入密码：

![image-20260705105604645](assets/image-20260705105604645.png)



![image-20260705105707415](assets/image-20260705105707415.png)







![image-20260705095008178](assets/image-20260705095008178.png)

 对A。java进行修改并提交

- 手动修改了下 文件

```\
public class A{

   public static void main(String args[]){


   }

}
```

提交改动轨迹

git commit -m '编写了一个main方法'

![image-20260705110103863](assets/image-20260705110103863.png)

将本地改动记录，推送到服务器



git push

![image-20260705110230691](assets/image-20260705110230691.png)

查看内容后发现信息被提交

![image-20260705110249765](assets/image-20260705110249765.png)



# 图形界面中使用Git(IDEA)



## 组长： 

### 创建项目

![image-20260705112040329](assets/image-20260705112040329.png)

### 创建仓库

相当于执行了`git init`

![image-20260705112115297](assets/image-20260705112115297.png)

### 提交并push

![image-20260705112318992](assets/image-20260705112318992.png)

![image-20260705112443316](assets/image-20260705112443316.png)



组长创建一个gitee仓库

![image-20260705112617178](assets/image-20260705112617178.png)



![image-20260705112647686](assets/image-20260705112647686.png)

### 推送信息

![image-20260705112708731](assets/image-20260705112708731.png)



![image-20260705112738195](assets/image-20260705112738195.png)

![image-20260705112746985](assets/image-20260705112746985.png)

![image-20260705112856943](assets/image-20260705112856943.png)



### 组长分享项目地址，邀请组员加入到项目中

![image-20260705133458725](assets/image-20260705133458725.png)



复制邀请的链接

![image-20260705133534894](assets/image-20260705133534894.png)

```
https://gitee.com/hrbu2024/his/invite_link?invite=05b26a038ae30c1aec4f00127f9ed3a89e209ec491657cb84128af42fb239ef86ca0e7dd908c16b5df263a67676d34d7   找自己项目的地址
```

## 组员获取项目

拿到项目邀请链接  点击【接受】

![image-20260705133919643](assets/image-20260705133919643.png)

### 使用idea 下载代码

获取下载地址

![image-20260705134037757](assets/image-20260705134037757.png)

### 克隆一个仓库

![image-20260705140535783](assets/image-20260705140535783.png)

![image-20260705134148976](assets/image-20260705134148976.png)

## 小组成员之前分享代码

### 1 第一个人修改代码

![image-20260705140812229](assets/image-20260705140812229.png)

![image-20260705140840367](assets/image-20260705140840367.png)

### 2 commit

在我的机器上面 记录一下 改动的内容

![image-20260705141031139](assets/image-20260705141031139.png)

#### 临时去掉代码检查

![image-20260705141117014](assets/image-20260705141117014.png)

![image-20260705141204574](assets/image-20260705141204574.png)

### 把最新的代码拉取下来，在 push

![image-20260705141352002](assets/image-20260705141352002.png)

![image-20260705141410974](assets/image-20260705141410974.png)

![image-20260705141425860](assets/image-20260705141425860.png)



### 推送到远端仓库(push)

![image-20260705141440251](assets/image-20260705141440251.png)

### 观察服务器可以看到代码已经更新了

![image-20260705141512034](assets/image-20260705141512034.png)





### 使用浏览器模拟提交代码，使用另外一个IDEA下载

![image-20260705143039854](assets/image-20260705143039854.png)



### 其他成员使用IDEA更新代码

![image-20260705143212606](assets/image-20260705143212606.png)







### 总结提交代码的步骤

- A 修改代码
- A comiit 
- A Update Project (拉取服务器的最新代码)
- A push
- 服务器是最新的代码
- B、C、D..等 Update Project









## 冲突的解决

### 两个人同时修改一段代码



![image-20260705145636400](assets/image-20260705145636400.png)



![image-20260705145724767](assets/image-20260705145724767.png)

### 大家做到一个  统一意见，保留最终的版本

![image-20260705145822353](assets/image-20260705145822353.png)

### 形成最终的结果

![image-20260705150000741](assets/image-20260705150000741.png)





点击【apply】

![image-20260705150126081](assets/image-20260705150126081.png)

点击 Mark Resolved 标记为已解决

### 再次push

![image-20260705150315837](assets/image-20260705150315837.png)