IDEA集成Git操作和Gitee

太过爱你忘了你带给我的痛 2024-04-01 12:08 62阅读 0赞

**目录**

一.前期准备

二.初始化,添加和提交

1.创建Git仓库(create)

2.将当前项目添加到暂存区(Add)

3.提交到本地库(Commit)

三.切换版本

四.创建分支

五.合并分支(正常合并)

六.合并分支(冲突合并)

五.Gitee账号注册和创建远程库

1.登录Gitee的官网

2.账号的注册和登录

3.创建远程库

六.将IDEA中的代码推送导Gitee

1.安装Gitee插件

2.在IDEA中登录Gitee账号

3.在IDEA上push你需要的代码到远程库

4.将Gitee的代码pull到IDEA上

5.克隆远程库到Gitee

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

## 一.前期准备 ##

首先我们需要配置Git的相关操作

Settings---->Version-Control---->Git选择自己的Git下载的地址,如下图所示

![2f7f9d0037784a5d99bad1d1b1438ca2.png][]

## 二.初始化,添加和提交 ##

### 1.创建Git仓库(create) ###

VCS-------->Create Git Repository

![dc325204a1f344eaa04d22102fdda6af.png][]

选择当前项目创建Git仓库

![d8c19872adc34f3d9dd223f2a8e99f34.png][]

之后会出现以下状态,当前状态表示Git已经检测到了这个文件,但当前文件还没有添加到暂存区里面

![4149d6a1b8904407918b993a421cc65a.png][]

### 2.将当前项目添加到暂存区(Add) ###

![693a86b9e6de4b468a059a8a23c4d683.png][]

此状态表示当前项目已经添加到了暂存区,但是还没有3.提交到本地库![2ceabd060eac4067ba7c69e2b4688c8f.png][]

### 3.提交到本地库(Commit) ###

![8016df32e9464ae3aa91ec2770459ceb.png][]

跳转到这个页面,选择你需要提交到本地库的项目

![984a36e532f44789817a13c8c288f34f.png][]

提交到本地库之后,文件回到最初的黑色

![7f5f5efdbe1747f8ae3cf98c6a78c43e.png][]

## 三.切换版本 ##

当我们已经追踪过的项目进行了修改之后,文件就变成了蓝色,如下图所示

![f44f84f8c8184869922c8ea65e3c7d6a.png][]

此时可以直接进行提交,并且在提交页面可以查看两次的变化

![b72a98bdeb47497d8931567b9835799b.png][]

Commit之后,通过Git--->log查看提交的版本,可以查看当前版本处于什么位置

![f1e4c204776d41f18b4bc37d5b315579.png][]

![fb74a59a672948b49bd24e7e3e4c2d78.png][]

**切换版本**

**鼠标右键需要切换的版本,并且Checkout Revision**

![a63f96cac0ff4cc6b6415c408cb6bc16.png][]

点击之后,黄色的头指针来到第一次Commit的版本,内容也来到第一次Commit时候的内容![e9e6fe760d9941f1981b95d314643ec4.png][]

## 四.创建分支 ##

**方法一:**

![f560f1afcaed4aa98fb40701efb5082b.png][]

方法二:

IDEA的右下角

![73fb40b546844866afd1706888e95a36.png][]

![f7ce18d373924d86b3a4bf6e8b01cef2.png][]

Checkout branch打钩了说明创建了自动切换过去,如果不打钩切换不过去

创建成功之后,右下角发生相应的改变

![f751764b07454bcba53c5ed8c1cb9630.png][]

**切换回主分支**

![42ff07fd58d540ce890c820dcd12263c.png][]

## 五.合并分支(正常合并) ##

在hot-fix分支进行操作并且提交之后,hot-fix分支与master分支内容就会发生改变

![0d9edebb1f7443618f06b9331049337f.png][]

**合并hot-fix分支合并到master分支.**

![f935101d1d1e4725b94ffbc41a8c6856.png][]

之后hot-fix分支的内容就会到master分支上

## 六.合并分支(冲突合并) ##

在hot-fix分支上进行修改并提交

![4715d56e2c2d481589508aa64c20d39b.png][]

切换到master分支,也进行修改并提交

![baea66cc25584a609119fab8965ed471.png][]

**合并hot-fix分支合并到master分支.**

![f61c3a030d674a248655bb9d11114cfc.png][]

点击merge![4225953352fe42f09005cd2078668dc3.png][]

![77ec5d803f8b4ca2a2aa777cb2c6fe8b.png][]

点击左边红色的,可以将左边的代码拿到中间的代码区

![87f6a9f5e37d4385bf30453f8b2040db.png][]

点击右边红色的,可以将右边的代码拿到中间的代码区

![290941edd10540b49ffae2bb582e8380.png][]

点击Apply

![b21f72d7a356461081ade6f348e8d0ec.png][]

## 五.Gitee账号注册和创建远程库 ##

### 1.登录Gitee的官网 ###

[Gitee - 基于 Git 的代码托管和研发协作平台][Gitee - _ Git]

### 2.账号的注册和登录 ###

正常的注册和登录.....

![d79982357bee4106b47dd059a3bb380b.png][]

### 3.创建远程库 ###

点击右上角的加号进行新建仓库

![d54e51edfabf4929a7b673298e6e7e3f.png][]

![b086e73a2cd7439294131dde3a07a833.png][]

![0bf249658c6f4cacb94897ef57e0248e.png][]

## 六.将IDEA中的代码推送导Gitee ##

### 1.安装Gitee插件 ###

在Setting-plugins中搜索Gitee进行安装

![a80b30ee8cd244f1a59c8a89d8789d17.png][]

### 2.在IDEA中登录Gitee账号 ###

settings-Version Control的Gitee

![2a4973bddc38421bb3c36a78e705c9ea.png][]

点击加号选择你想要的方式进行Gitee账号的登录

![456ade3be12e45199f78672ce43b5c30.png][]

出现以下账号信息表示登录成功![8bc5b26607b84d20acabc366e22834fb.png][]

###  **3.在IDEA上push你需要的代码到远程库** ###

**复制远程仓库的链接**

![ec019e4991504b9ba55cb7404d6fb6a7.png][]

点击如下按钮进行push

![2c8084c2e3b946e6976e6aa1c015bbcd.png][]

点击define remote,将刚才复制的远程仓库的链接复制

![4ec6d1db9995498ebae91c50630b081a.png][]

选择完毕之后直接push

打开Gitee查看刚才push的代码,出现你push的代码表示成功

![c04257c0fe454ef585196e9d8fc4a26a.png][]

修改原来的代码,再一次push

![7d48b0b6387f444faeaced9a5e31dbf5.png][]

此时Gitee的代码随之发生改变

### 4.将Gitee的代码pull到IDEA上 ###

![b9293f448b324bb88b7bf90f4a540624.png][]

![88b0a319272b4bfc8177cafdc52e4269.png][]

### 5.克隆远程库到Gitee ###

在Gitee仓库的上边复制

![9d46c4a6adcc40989ebd70d6e59edf48.png][]

点击下图所示project from version control

![b6f8d5ab4b094f059ddb9e341b8548bc.png][]

将复制的url复制下来,选择文件保存的位置即可,这样便Clone成功![8c017924da8c4e768cf3c864cc422c72.png][]

[2f7f9d0037784a5d99bad1d1b1438ca2.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/f084606cfb8d444191c77eeb6bae9ac0.png
[dc325204a1f344eaa04d22102fdda6af.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/f29268cd38e64a7597990457613804b8.png
[d8c19872adc34f3d9dd223f2a8e99f34.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/2693b3d7e62e47c4bf2938ff99be7851.png
[4149d6a1b8904407918b993a421cc65a.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/ea66166558ff4b91914f825833e2345f.png
[693a86b9e6de4b468a059a8a23c4d683.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/dc60de7a16a246ae9c159458adcfe491.png
[2ceabd060eac4067ba7c69e2b4688c8f.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/5b380d7a57f444cdaf96ed8b5f0998ae.png
[8016df32e9464ae3aa91ec2770459ceb.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/20d4c01f62b04e659f8f69472471501e.png
[984a36e532f44789817a13c8c288f34f.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/e14ceb4e62754f3b8c2e70a51e1c15af.png
[7f5f5efdbe1747f8ae3cf98c6a78c43e.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/51a7aefec08248c29be96f830fd55f6f.png
[f44f84f8c8184869922c8ea65e3c7d6a.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/8afb4afbdf134c4b8d7d02d37312bf2c.png
[b72a98bdeb47497d8931567b9835799b.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/e63fcbb215e64d0a80469d97ec4884c1.png
[f1e4c204776d41f18b4bc37d5b315579.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/15cd7080317a48768cfad5e00b922931.png
[fb74a59a672948b49bd24e7e3e4c2d78.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/8020eafb9f5a41dc8af3f4beab97705f.png
[a63f96cac0ff4cc6b6415c408cb6bc16.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/6d15d3e122e94b5f93bfa35a59091d74.png
[e9e6fe760d9941f1981b95d314643ec4.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/b0d65078267a44a2939410664e593b67.png
[f560f1afcaed4aa98fb40701efb5082b.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/00b3e9c999aa4fa89ad21b152ad14b8a.png
[73fb40b546844866afd1706888e95a36.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/7412f4db24a8488685a7b12f1ead5c29.png
[f7ce18d373924d86b3a4bf6e8b01cef2.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/78d96675c52d4bd5ad03645d8f45d6ef.png
[f751764b07454bcba53c5ed8c1cb9630.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/b0e435689f7949a58a2d4118cd5419e0.png
[42ff07fd58d540ce890c820dcd12263c.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/bb80050f43f14509af8112ee76fc8bc2.png
[0d9edebb1f7443618f06b9331049337f.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/18d62f527b4f41c48fc6d1b86fecb6ff.png
[f935101d1d1e4725b94ffbc41a8c6856.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/6d7579caf96049a0b663eb7f54c9144a.png
[4715d56e2c2d481589508aa64c20d39b.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/e1434245a90a4de89d8c2e5f0b41c1bb.png
[baea66cc25584a609119fab8965ed471.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/c09bfc902f8a4345b82951127e39c243.png
[f61c3a030d674a248655bb9d11114cfc.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/11d9ebec6f5a419282e9bd81fcd38f86.png
[4225953352fe42f09005cd2078668dc3.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/2b062ebcc9294823abaf98867a853db7.png
[77ec5d803f8b4ca2a2aa777cb2c6fe8b.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/b9a1b282a2cc401fa67eb1ed30a83b92.png
[87f6a9f5e37d4385bf30453f8b2040db.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/783995e550204853b7b6e6e908a3ca4d.png
[290941edd10540b49ffae2bb582e8380.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/8c4b7cb8a100414d88d9821e0f1d6e88.png
[b21f72d7a356461081ade6f348e8d0ec.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/fc1b29c751cf4701861db7efc5b11d7f.png
[Gitee - _ Git]: https://gitee.com/
[d79982357bee4106b47dd059a3bb380b.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/5f18b90db2b24e79825d81c8d0080545.png
[d54e51edfabf4929a7b673298e6e7e3f.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/24594a59b4d540fba52ebb4f3a725617.png
[b086e73a2cd7439294131dde3a07a833.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/7fd37ed7b8ea4e73834b178c4703858a.png
[0bf249658c6f4cacb94897ef57e0248e.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/570cb57372104f22a7e1d4d167a3a506.png
[a80b30ee8cd244f1a59c8a89d8789d17.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/f8f29b9221ed4fde9aa6768410b76fa9.png
[2a4973bddc38421bb3c36a78e705c9ea.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/d374a38569e9476888f3a0faa11bbdc5.png
[456ade3be12e45199f78672ce43b5c30.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/8723f996353c438393c69c486038b3c0.png
[8bc5b26607b84d20acabc366e22834fb.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/ece0d32492bb42db871bd219c3395e00.png
[ec019e4991504b9ba55cb7404d6fb6a7.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/fc72c347e06841b2a3d428d3d83f452e.png
[2c8084c2e3b946e6976e6aa1c015bbcd.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/2413732edcd443fd944997d0586416e5.png
[4ec6d1db9995498ebae91c50630b081a.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/8385b4ed4daa4bd78de5cb0d4fa2ddd0.png
[c04257c0fe454ef585196e9d8fc4a26a.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/2a8952bd0bb64d1387bbdb401581eaa2.png
[7d48b0b6387f444faeaced9a5e31dbf5.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/04dc6d6373bd448caa9dcfb5a707d800.png
[b9293f448b324bb88b7bf90f4a540624.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/515e7702d3ef4cffb82fded1fc7e429d.png
[88b0a319272b4bfc8177cafdc52e4269.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/80ee166de9e849768c14a7bebb1578ad.png
[9d46c4a6adcc40989ebd70d6e59edf48.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/6a21685df078446ca9f7b09906190a76.png
[b6f8d5ab4b094f059ddb9e341b8548bc.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/d51f1ba7b6784abbbfd7f8157eb96855.png
[8c017924da8c4e768cf3c864cc422c72.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/04/01/8d79201b5b734ffbbe96a35094e1e8ff.png