Git学习笔记（四）

创建与合并分支

1.每次提交，Git都把它们串成一条时间线，一开始的时候，master分支就是一条线，Git用master指向最新的提交，再用HEAD指向master,就能确定当前分支，以及当前分支的提交点。

每次提交，master分支都会向前移动一步，这样，随着不断提交，master分支线也越来越长。
2.当我们创建新的分支时，例如dev时，Git新建了一个指针叫dev，指向master相同的提交，再把HEAD指向dev，就表示当前分支在dev上。

3.现在开始，对工作区的任何修改和提交都是针对dev分支了。新提交一次后，dev指针前移一步。

**4.**dev上的工作已经完成，把dev合并到master上。直接把master指向dev的当前提交。

5.删除dev分支

一个有趣的小实验

在master分支上，对readme.txt文件做一些修改，然后提交，接着创建一个dev分支，并对readme.txt做一些修改。同样提交。切换到master分支，刚做的修改不可见，只有合并了dev分支，修改才可见。

$ mkdir afeng

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop
$ cd afeng

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng
$ git init
Initialized empty Git repository in C:/Users/赵亚峰/Desktop/afeng/.git/

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ vi readme.txt

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ git add readme.txt

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ git commit -m "branch"
[master (root-commit) 0c82003] branch
 1 file changed, 2 insertions(+)
 create mode 100644 readme.txt

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ git checkout -b dev
Switched to a new branch 'dev'

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (dev)
$ git branch
* dev
  master

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (dev)
$ vi readme.txt

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (dev)
$ git add readme.txt

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (dev)
$ git commit -m "branch test"
[dev 450c9cc] branch test
 1 file changed, 1 insertion(+), 1 deletion(-)

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (dev)
$ git checkout master
Switched to branch 'master'

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ cat readme.txt
create and merge branchs


赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ git merge dev
Updating 0c82003..450c9cc
Fast-forward
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ cat readme.txt
create and merge branchs
Creating a new branch is quick

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ git branch -d dev
Deleted branch dev (was 450c9cc).

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ git branch
* master

实验中所有到的新命令：

查看分支：git branch
创建分支： git branch name
切换分支：git checkout name
创建并切换分支：git checkout -b name
合并某个分支到当前分支： git merge name
删除分支： git branch -d name

解决冲突

在新分支和master分支修改了同一个内容导致的。
就是将这样的分支图变成这样的

解决分支冲突的小实验室

$ mkdir afeng

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop
$ cd afeng

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng
$ git init
Initialized empty Git repository in C:/Users/赵亚峰/Desktop/afeng/.git/

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ vi readme.txt

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ git add readme.txt

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ git commit -m "test"
[master (root-commit) da00b7a] test
 1 file changed, 1 insertion(+)
 create mode 100644 readme.txt

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ git checkout -b dev
Switched to a new branch 'dev'

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (dev)
$ vi readme.txt

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (dev)
$ git add readme.txt

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (dev)
$ git commit -m "new branch"
[dev 164b8ed] new branch
 1 file changed, 1 insertion(+), 1 deletion(-)

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (dev)
$ git checkout master
Switched to branch 'master'

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ vi readme.txt

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ git add readme.txt

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ git commit -m "master test"
[master 6800aa0] master test
 1 file changed, 1 insertion(+), 1 deletion(-)

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ git merge dev
Auto-merging readme.txt
CONFLICT (content): Merge conflict in readme.txt
Automatic merge failed; fix conflicts and then commit the result.

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (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:   readme.txt

no changes added to commit (use "git add" and/or "git commit -a")

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master|MERGING)
$ cd readme.txt
bash: cd: readme.txt: Not a directory

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master|MERGING)
$ cat readme.txt
<<<<<<< HEAD
Creating a new branch is quick & simple
=======
Creating a new branch is quick AND simple
>>>>>>> dev

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master|MERGING)
$ vi readme.txt

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master|MERGING)
$ git add readme.txt

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master|MERGING)
$ git commit -m "resolve conflick"
[master 8b8a0e2] resolve conflick

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ cat readme.txt
<<<<<<< HEAD
Creating a new branch is quick and simple
=======
Creating a new branch is quick and simple
>>>>>>> dev

当Git无法自动合并分支时，就必须首先解决冲突，冲突解决后，在提交，合并完成。

用git log –graph命令查看分支合并图。

通常情况下，分支合并用的是Fast forward这种模式，但这种模式的缺点是删除分支后，会丢失分支信息。
普通模式合并：git merge –no-ff
Git会在merge时生成一个新的commit,这样从分支历史就可以看出分支信息。

分支管理策略

在实际开发中，我们应该按照几个基本原则进行分支管理：

首先，master分支应该是非常稳定的，也就是仅用来发布新版本，平时不能在上面干活；

那在哪干活呢？干活都在dev分支上，也就是说，dev分支是不稳定的，到某个时候，比如1.0版本发布时，再把dev分支合并到master上，在master分支发布1.0版本；

你和你的小伙伴们每个人都在dev分支上干活，每个人都有自己的分支，时不时地往dev分支上合并就可以了。

参考资料：廖雪峰老师官网Git教程

https://www.liaoxuefeng.com/wiki/0013739516305929606dd18361248578c67b8067c8c017b000