# git-learn **Repository Path**: hrbu2023/git-learn ## Basic Information - **Project Name**: git-learn - **Description**: git学习使用 - **Primary Language**: Unknown - **License**: Not specified - **Default Branch**: master - **Homepage**: None - **GVP Project**: No ## Statistics - **Stars**: 0 - **Forks**: 0 - **Created**: 2026-04-07 - **Last Updated**: 2026-04-07 ## Categories & Tags **Categories**: Uncategorized **Tags**: None ## README # git ## 安装 ![image-20260407084041339](assets/image-20260407084041339.png) https://github.com/git-for-windows/git/releases/download/v2.53.0.windows.2/Git-2.53.0.2-64-bit.exe ![image-20260407084310143](assets/image-20260407084310143.png) ![image-20260407084324654](assets/image-20260407084324654.png) ![image-20260407084500014](assets/image-20260407084500014.png) ![image-20260407084538990](assets/image-20260407084538990.png) ![image-20260407084632320](assets/image-20260407084632320.png) ![image-20260407084736408](assets/image-20260407084736408.png) ![image-20260407084849792](assets/image-20260407084849792.png) ![image-20260407084949384](assets/image-20260407084949384.png) ![image-20260407085112375](assets/image-20260407085112375.png) ![image-20260407085320023](assets/image-20260407085320023.png) ![image-20260407085440753](assets/image-20260407085440753.png) ![image-20260407085618823](assets/image-20260407085618823.png) ![image-20260407085643958](assets/image-20260407085643958.png) ![image-20260407085716881](assets/image-20260407085716881.png) ![image-20260407085733790](assets/image-20260407085733790.png) ![image-20260407085916821](assets/image-20260407085916821.png) ## 使用 ### 创建本地仓库 [学习网站](https://help.gitee.com/learn-Git-Branching/?locale=zh_CN) ``` git init ``` ![image-20260407090123246](assets/image-20260407090123246.png) ### 查看仓库的状态 ![image-20260407090447434](assets/image-20260407090447434.png) ### 添加文件到暂存区 意思是 有git 工具管理文件的变更轨迹 ``` git add a.txt ``` ![image-20260407090731352](assets/image-20260407090731352.png) ![image-20260407090746161](assets/image-20260407090746161.png) 也可以使用通配符 - 所有txt git add *.txt - 当前文件夹 git add ./ ### 提交 配置环境信息(告诉git 你是谁) 将文件的改动轨迹保存到git历史记录中 ![image-20260407090927923](assets/image-20260407090927923.png) ![image-20260407090953675](assets/image-20260407090953675.png) ```` git config --global user.email "zhangjinshan21f@163.com" git config --global user.name "jshand" ```` ![image-20260407091322393](assets/image-20260407091322393.png) ### 提交 ![image-20260407091410681](assets/image-20260407091410681.png) 如果文件发生变更 只需要再次commit 即可，无需再次添加 ![image-20260407091534226](assets/image-20260407091534226.png) ![image-20260407091633332](assets/image-20260407091633332.png) ## 推送到远端仓库 可以使用[gitlab](https://www.oschina.net/p/gitlab) [docker 安装gitlab以及使用 | 金山老师的笔记](https://blog.fulfill.com.cn/course/01-java/gitlab.html) ![image-20260407092317757](assets/image-20260407092317757.png) 可是使用Github、[Gitee](https://gitee.com/) ### 创建账号Gitee ![image-20260407092818716](assets/image-20260407092818716.png) ### 登录 ![image-20260407092850300](assets/image-20260407092850300.png) ![image-20260407093037530](assets/image-20260407093037530.png) ### 创建仓库 ![image-20260407093112382](assets/image-20260407093112382.png) ![image-20260407093316939](assets/image-20260407093316939.png) ![image-20260407093525610](assets/image-20260407093525610.png) ### 在本地项目中添加远端仓库 ![image-20260407093639927](assets/image-20260407093639927.png) ## 推送代码到远端服务器 git push -u origin ![image-20260407093759044](assets/image-20260407093759044.png) # 默认的图形界面工具 ![image-20260407102747356](assets/image-20260407102747356.png) ![image-20260407102804986](assets/image-20260407102804986.png) # [TortoiseGit](https://tortoisegit.org/) ## 安装 [Download – TortoiseGit – Windows Shell Interface to Git](https://tortoisegit.org/download/) 通过网盘分享的文件：TortoiseGit-2.17.0.2-64bit.msi 链接: https://pan.baidu.com/s/1bO4emo6N40ERsFaiXUj8OA?pwd=fnc6 提取码: fnc6 --来自百度网盘超级会员v8的分享 ![image-20260407103124702](assets/image-20260407103124702.png) ![image-20260407103215083](assets/image-20260407103215083.png) ![image-20260407103435312](assets/image-20260407103435312.png) ![image-20260407103451589](assets/image-20260407103451589.png) ![image-20260407103504186](assets/image-20260407103504186.png) ![image-20260407103516908](assets/image-20260407103516908.png) ![image-20260407103622318](assets/image-20260407103622318.png) ![image-20260407103659769](assets/image-20260407103659769.png) ![image-20260407103721592](assets/image-20260407103721592.png) ![image-20260407103740007](assets/image-20260407103801728.png) ## 使用 ### 创建本地仓库 ![image-20260407104011646](assets/image-20260407104011646.png) ![image-20260407104039498](assets/image-20260407104039498.png) ![image-20260407104044311](assets/image-20260407104044311.png) ### 添加到暂存区 ![image-20260407104302387](assets/image-20260407104302387.png) ![image-20260407104346329](assets/image-20260407104346329.png) ### 提交改动记录 ![image-20260407104456742](assets/image-20260407104456742.png) ![image-20260407104530844](assets/image-20260407104530844.png) ### 查看状态 通过文件图标可以查看到当前文件的状态(安装完 后需要重启) 或者通过show log查看日志 ![image-20260407104624596](assets/image-20260407104624596.png) ![image-20260407104752284](assets/image-20260407104752284.png) ### 推送到远端仓库 创建一个gitee的仓库 ![image-20260407104925960](assets/image-20260407104925960.png) ### 添加远端仓库 ![image-20260407105005618](assets/image-20260407105005618.png) ![image-20260407105122970](assets/image-20260407105122970.png) ![image-20260407105201166](assets/image-20260407105201166.png) ### 推送到远端仓库 ![image-20260407105247362](assets/image-20260407105247362.png) ![image-20260407105315278](assets/image-20260407105315278.png) ![image-20260407105355755](assets/image-20260407105355755.png) ### 无需单独的add ![image-20260407105526897](assets/image-20260407105526897.png) ![image-20260407105600249](assets/image-20260407105600249.png) ### 提交的同时 执行 push ![image-20260407105707286](assets/image-20260407105707286.png) # 拉取文件 ## git shell ```shell git pull ``` ![image-20260407111828732](assets/image-20260407111828732.png) ![image-20260407111916571](assets/image-20260407111916571.png) ## 小乌龟 - 添加文件 - 提交 ![image-20260407112031206](assets/image-20260407112031206.png) ## 使用小乌龟拉取(同步sync) ![image-20260407112124032](assets/image-20260407112124032.png) ![image-20260407112145401](assets/image-20260407112145401.png) # 协同开发 小组开发每个组一个仓库(组长创建仓库、组员) - 组长：创建仓库 https://gitee.com/jshand/tortoise-git - 将组员添加都仓库 ![image-20260407114635741](assets/image-20260407114635741.png) ![image-20260407114703242](assets/image-20260407114703242.png) ## 组员 需要将你的仓库克隆到本地 ![image-20260407114803933](assets/image-20260407114803933.png) ![image-20260407114836015](assets/image-20260407114836015.png) ### 命令行的方式克隆 ![image-20260407114945555](assets/image-20260407114945555.png) ### 使用小乌龟克隆 ![image-20260407115040088](assets/image-20260407115040088.png) ![image-20260407115141068](assets/image-20260407115141068.png) # 冲突的解决 > 多个人同时修改一段代码可能会产生冲突!!!!!!!!!!!!!!!! 张三--Gitee ![image-20260407134309460](assets/image-20260407134309460.png) 李四在本地修改 ![image-20260407134303074](assets/image-20260407134303074.png) ![image-20260407134240548](assets/image-20260407134240548.png) ![image-20260407134401304](assets/image-20260407134401304.png) - 首先拉取最新的代码 ![image-20260407134509332](assets/image-20260407134509332.png) ![image-20260407134529469](assets/image-20260407134529469.png) ![image-20260407134547645](assets/image-20260407134547645.png) ![image-20260407134652234](assets/image-20260407134652234.png) ## 编辑冲突 ![image-20260407134730073](assets/image-20260407134730073.png) ![image-20260407134850409](assets/image-20260407134850409.png) ![image-20260407135022296](assets/image-20260407135022296.png) ## 标记为已解决 ![image-20260407135048687](assets/image-20260407135048687.png) 或者CTRL+S保存 ![image-20260407135114404](assets/image-20260407135114404.png) 再次提交和推送，服务器为最新的代码 # 集成开发环境 IDEA中使用git 不需要安装，已经预装了插件 - 初始化仓库( 组长) - 提交代码 - 推送到远端仓库(Gitee) - 其他组员可以拉取项目 - 冲突的解决 ## 初始化仓库( 组长) - 组长创建项目 - 聚合项目 - spirngboot - vue ![image-20260407142757476](assets/image-20260407142757476.png) ### 导入IDEA ![image-20260407142951856](assets/image-20260407142951856.png) ### 创建仓库 ![image-20260407143017788](assets/image-20260407143017788.png) ![image-20260407143035619](assets/image-20260407143035619.png) ### 忽略文件 有一些文件是不需要随着源码提交的，可以添加到忽略文件 ![image-20260407143157073](assets/image-20260407143157073.png) #### 创建一个文件 .gitignore ![image-20260407143405855](assets/image-20260407143405855.png) ``` target/ !.mvn/wrapper/maven-wrapper.jar !**/src/main/**/target/ !**/src/test/**/target/ ### IntelliJ IDEA ### .idea/modules.xml .idea/jarRepositories.xml .idea/compiler.xml .idea/libraries/ *.iws *.iml *.ipr ### Eclipse ### .apt_generated .classpath .factorypath .project .settings .springBeans .sts4-cache ### NetBeans ### /nbproject/private/ /nbbuild/ /dist/ /nbdist/ /.nb-gradle/ build/ !**/src/main/**/build/ !**/src/test/**/build/ ### VS Code ### .vscode/ ### Mac OS ### .DS_Store ``` ## 提交代码 ![image-20260407143553310](assets/image-20260407143553310.png) 提交前检查的操作，暂时去掉了，要不提交会比较慢 ![image-20260407143705065](assets/image-20260407143705065.png) ![image-20260407143746401](assets/image-20260407143746401.png) 不需要单独的add，可以设置总是 add 新文件 ![image-20260407143828072](assets/image-20260407143828072.png) ## 推送到远端（Gitee） ### 创建远端仓库 ![image-20260407144001418](assets/image-20260407144001418.png) ![image-20260407144027893](assets/image-20260407144027893.png) ![image-20260407144059325](assets/image-20260407144059325.png) ![image-20260407144315310](assets/image-20260407144315310.png) ![image-20260407144330897](assets/image-20260407144330897.png) ## 查看日志 ![image-20260407144130801](assets/image-20260407144130801.png) ![image-20260407144151279](assets/image-20260407144151279.png) ### 修改commit message ## 组员下载组长的项目 组长将组员添加到项目中 ![image-20260407144454888](assets/image-20260407144454888.png) 使用IDEAclone项目 ![image-20260407144519830](assets/image-20260407144519830.png) ![image-20260407144551703](assets/image-20260407144551703.png) ![image-20260407144626429](assets/image-20260407144626429.png) ## 冲突的解决 组长和组员同时修改一段代码 ![image-20260407144743031](assets/image-20260407144743031.png) ![image-20260407144836423](assets/image-20260407144836423.png) ![image-20260407144910237](assets/image-20260407144910237.png) ### 组员提交代码 commit完成之后，直接push ![image-20260407145001129](assets/image-20260407145001129.png) ![image-20260407145017413](assets/image-20260407145017413.png) ![image-20260407145104362](assets/image-20260407145104362.png) push的时候 工具检测到 服务器端的代码有更新，并且需要合并冲突 进行合并【merge】 ![image-20260407145155473](assets/image-20260407145155473.png) 合并完成之后，发现出现冲突，需要解决冲突 ![image-20260407145232513](assets/image-20260407145232513.png) ![image-20260407145307601](assets/image-20260407145307601.png) ![image-20260407145354046](assets/image-20260407145354046.png) ![image-20260407145424058](assets/image-20260407145424058.png) ![image-20260407145444682](assets/image-20260407145444682.png)