GIT常用命令-分支管理
Posted cjxltd
tags:
篇首语:本文由小常识网(cha138.com)小编为大家整理,主要介绍了GIT常用命令-分支管理相关的知识,希望对你有一定的参考价值。
分支管理的好处:既不影响别人的工作又无需承担文件进度丢失的风险
![git-br-initial](https://image.cha138.com/20210608/3e0e4ba66aec49458a0b65a0265d9dc0.jpg)
![git-br-create](https://image.cha138.com/20210608/5741a853f91c4d7e8e416c076acfc487.jpg)
![git-br-ff-merge](https://image.cha138.com/20210608/68285b4e5dd84380a6f83b306f829d8b.jpg)
![git-br-feature1](https://image.cha138.com/20210608/4b22d04628594e6288f7163340228b9d.jpg)
![git-no-ff-mode](https://image.cha138.com/20210608/5321f89633144211b1b5082831e216f2.jpg)
![git-br-policy](https://image.cha138.com/20210608/1b8bb350f5654e7e871fc6828341160d.jpg)
1.创建与合并冲突
![git-br-initial](https://image.cha138.com/20210608/3e0e4ba66aec49458a0b65a0265d9dc0.jpg)
![git-br-create](https://image.cha138.com/20210608/5741a853f91c4d7e8e416c076acfc487.jpg)
![git-br-ff-merge](https://image.cha138.com/20210608/68285b4e5dd84380a6f83b306f829d8b.jpg)
$ git checkout -b dev
相当于
$ git branch dev
$ git checkout dev
$ git branch
查看分支
$ git checkout master
切换分支
$ git merge dev
$ git branch -d dev
删除分支
2.解决冲突
![git-br-feature1](https://image.cha138.com/20210608/4b22d04628594e6288f7163340228b9d.jpg)
Git is a distributed version control system.
Git is free software distributed under the GPL.
Git has a mutable index called stage.
Git tracks changes of files.
<<<<<<< HEAD
Creating a new branch is quick & simple.
=======
Creating a new branch is quick AND simple.
>>>>>>> feature1
解决冲突后继续提交
$ git log --graph --pretty=oneline --abbrev-commit
3. 分支管理策略
$ git merge --no-ff -m "merge with no-ff" dev
![git-no-ff-mode](https://image.cha138.com/20210608/5321f89633144211b1b5082831e216f2.jpg)
![git-br-policy](https://image.cha138.com/20210608/1b8bb350f5654e7e871fc6828341160d.jpg)
4 bug分支
$ git stash
用于把当前现场存储起来 等一会恢复继续工作
$ git stash list
显示stash存放的地方
git stash apply
git stash drop
恢复stash 删除stash
git stash pop
恢复同时把stash也删除了
$ git stash apply stash@{0}
多次stash之后恢复指定的stash
5 feature分支
$ git branch -D feature-vulcan
在创建了提交了分支之后,想不合并分支直接删除分支,需要大写的D来删除分支
6 多人协作
$ git pull
更新分支
$ git branch --set-upstream dev origin/dev
合并远程和本地分支
$ git remote -v
以上是关于GIT常用命令-分支管理的主要内容,如果未能解决你的问题,请参考以下文章
源代码管理相关命令(Git常用命令Nuget常用命令CMD常用命令)