GIT详细笔记(2)
2023-06-13 09:13:59 时间
分支的操作
命令名称 | 作用 |
---|---|
git branch 分支名 | 创建分支 |
git branch -v | 查看当前分支 |
git checkout 分支名 | 切换分支 |
git merge 分支名 | 把指定的分支合并到当前分支上 |
查看当前分支——git branch -v
ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master)
$ git branch -v
* master 534cbd3 third commit
创建分支——git branch 分支名
ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master)
$ git branch hot-fix
ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master)
$ git branch -v
hot-fix 534cbd3 third commit
* master 534cbd3 third commit
切换分支——git checkout 分支名
ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master)
$ git checkout hot-fix
Switched to branch 'hot-fix'
ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (hot-fix)
$
ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (hot-fix)
$ git branch -v
* hot-fix 534cbd3 third commit
master 534cbd3 third commit
合并分支——git merge 分支名
ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master)
$ git merge hot-fix
Updating 534cbd3..017517e
Fast-forward
hello.txt | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
合并分支(冲突合并)
检测有文件有两处修改
显示冲突
ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master)
$ git merge hot-fix
Auto-merging hello.txt
CONFLICT (content): Merge conflict in hello.txt
Automatic merge failed; fix conflicts and then commit the result.
ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master|MERGING)
$
ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master|MERGING)
$ git status
On branch master
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: hello.txt
no changes added to commit (use "git add" and/or "git commit -a")
冲突合并
# 1.查看冲突代码
ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master|MERGING)
$ vim hello.txt
# <<<< HEAD 当前分支代码
# <<<< HEAD 当前分支代码 =======
# ======= 合并分支代码 >>>>>>> hot-fix
#删除特殊符号 以及 重复代码
#2.添加到暂存区
ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master|MERGING)
$ git add hello.txt
#3.提交本地库(不能带文件名)
ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master|MERGING)
$ git commit -m "marge test"
fatal: cannot do a partial commit during a merge.
#4.切换分支查看
ws199@DESKTOP-2N1I9JA MINGW64 /d/GIT/Git-Space/git.demo (master)
$ git checkout hot-fix
Switched to branch 'hot-fix'
#冲突合并,合并当前分支,不合并被合并分支
# head ---> master(分支内容)--->版本号
# HEAD决定当前分支
相关文章
- 医咖会SPSS免费教程学习笔记—R*C卡方检验
- 图解算法学习笔记
- XML笔记
- (数据科学学习手札141)利用Learn Git Branching轻松学习git常用操作
- 1.Python3基础入门学习笔记(一)
- GIT详细基础笔记(1)
- git 报错Git fatal: Unknown index entry format xxxxx的错误解决方法
- Git—记录一次自建git服务器和客户端的过程
- day10 | Git的正确使用姿势与最佳实践 | 第三届字节跳动青训营笔记
- Git命令——学习笔记2
- 【蓝桥杯2022省赛】蓝桥杯题目笔记 Java版本数位排序、求阶乘基础与灵活分析
- 【Git】Git 版本管理 ( 补充提交版本 git commit --amend | 版本库提取文件 git checkout -- filename | 删除文件 git rm )
- 【错误记录】Git 使用报错 ( git: ‘switch‘ is not a git command. See ‘git --help‘. )
- 【错误记录】Git 使用报错 ( git branch -a 仍能查询到已经删除的远程分支 )
- 学习小组day3笔记-linux服务器上的软件安装/conda
- 连接Linux:Git的使用方法(git连接linux)
- 老男孩记录生活:我的Linux笔记(老男孩linux笔记)
- js宝典学习笔记(上)
- Android开发笔记之:Splash的实现详解