idea中git的使用详细说明

小咪咪 2024-03-17 00:15 48阅读 0赞

**一.克隆项目**  
1. 打开File>New>Project from Version Control...

![2680189bc4b5434a891d392abec7fc03.png][]

2. 打开gitLab，复制项目地址![788ae75828d5475f84bc28024e374933.png][]

3. 粘贴到第1步中的URL中，点击“Clone”![9b1657ddf2b4478d9f049e489b48966f.png][]

**二.代码提交**  
1. 修改文件后需要提交时，可以在git-Local Changes中看到你修改的文件及修改内容![dfcf33159b064796bf76d54d5eb82806.png][]

2. 选中要提交的文件，右键，选择“Commit File”  
![b1d448815be54dcb9fc151c3bc0ca97b.png][]

3. 填写本次提交的内容，然后点击“Commit”  
![5d42da524996468293516dd2c5934ffd.png][]  
下面会提示提交成功![618632063a98436b9bd8821c102c0d25.png][]

**三.代码推送**  
1. 提交完修改后，只是提交到本地的仓库，还要推送远程![97eff990fa4345ddac6efb9dbf2c46f0.png][]

2. 点击右上角的push按钮，会出现刚才提交的内容，确认后点击“Push”  
![565189e803634a68ac7b94ecc1a91b9f.png][]  
如果远程仓库中有更新，会有如下提示：  
![f5ae78f68b97495497e216bcec32847c.png][]  
点击“Merge”与远程仓库代码进行同步

3. 推送成功会有提示![4539a33434c44146b242985c8fa5a688.png][]

**四.分支切换与拉取**

1.在git窗口右下角，可以看到当前git的分支，点击可以本地和远程的分支，并可以切换  
![e5e383b641dc4f44bb0b6bb76326a98c.png][]  
选择要切换的分支，然后点击“Checkout”

![b99c96ab35b54494bf41d560a0d3e414.png][]

2. 如果要拉取远程的分支，点开Remote，然后选择要拉取的分支，点击“Checkout”，成功后自动切换到拉取的分支上来![c8b9ab98b1294f36ac9cf6c3647f0b5f.png][]

**五.代码冲突**  
拉取或推送代码时如果有git不能解决的冲突的话，会有如下提示  
![0fc4d394f56b45419c58f514ae981def.png][]  
“Accept Yours”是丢弃对方的修改，选择你本地的修改  
“Accept Theirs”是丢弃你本地的修改，选择对方的修改  
如果2个人的修改都要保留，就选择Merge，手动解决冲突

**六.查看分支历史**  
在git的log窗口，可以查看所有分支及各分支的修改推送历史![7e4f4222f5b64ad68398f1100e10ff91.png][]

[2680189bc4b5434a891d392abec7fc03.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/03/15/1ce181640ca14651802e3238116c661f.png
[788ae75828d5475f84bc28024e374933.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/03/15/d43539bb6cee48349614e3366289eceb.png
[9b1657ddf2b4478d9f049e489b48966f.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/03/15/081f07956e654aff98627ac8f4250747.png
[dfcf33159b064796bf76d54d5eb82806.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/03/15/0ec0d6ff29b4459285ab13eb75bcd468.png
[b1d448815be54dcb9fc151c3bc0ca97b.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/03/15/f7c1c508929d4113a23ffe5e9514272b.png
[5d42da524996468293516dd2c5934ffd.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/03/15/b0de90dc14974558951f150ff35230c9.png
[618632063a98436b9bd8821c102c0d25.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/03/15/074b057d05cb4a2087145fc29f34e695.png
[97eff990fa4345ddac6efb9dbf2c46f0.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/03/15/b4c5df6021784cc9820eeccf94525f33.png
[565189e803634a68ac7b94ecc1a91b9f.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/03/15/1aabf9755380450699ec0a6b5cf04073.png
[f5ae78f68b97495497e216bcec32847c.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/03/15/929b349e746d42f1b74aded095013bcd.png
[4539a33434c44146b242985c8fa5a688.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/03/15/1c3a3931e0714d09bc642b67cf7d74ee.png
[e5e383b641dc4f44bb0b6bb76326a98c.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/03/15/3ca5f9dd36ee464aac7456ba0c7078ac.png
[b99c96ab35b54494bf41d560a0d3e414.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/03/15/61be4058f5f34d0484458627f5c182bc.png
[c8b9ab98b1294f36ac9cf6c3647f0b5f.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/03/15/7949981c0b064d0eabdfafa2e6dd3d04.png
[0fc4d394f56b45419c58f514ae981def.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/03/15/344f05ea0a8c444eb66f09b4147878dc.png
[7e4f4222f5b64ad68398f1100e10ff91.png]: https://image.dandelioncloud.cn/pgy_files/images/2024/03/15/8b973255c827404e827f84100fe32368.png