1. 随笔一记

Git基本操作之branch与merge

Written by Posted on Less than 0 min read

还是拿上次的哪个GitTest项目进行学习branch和merge操作。

在操作之前我已经将项目pull回本地的gittest目录下面了。

1.查看当前有哪些branch

Michael Jiang@DESKTOP-JUOEVVQ MINGW64 ~/Desktop/gittest (master)
$ git branch
* master

可以看出只有master

2.新建一个名为test1 的分支

Michael Jiang@DESKTOP-JUOEVVQ MINGW64 ~/Desktop/gittest (master)
$ git branch test1

3.切换到test1分支

Michael Jiang@DESKTOP-JUOEVVQ MINGW64 ~/Desktop/gittest (master)
$ git checkout test1
Switched to branch 'test1'

Michael Jiang@DESKTOP-JUOEVVQ MINGW64 ~/Desktop/gittest (test1)
$

可以看出当前位置已经从master切换到test1了

【当然你也可以一键创建分支和切换branch】命令如下：

$git checkout -b test1

4.修改branch的名字

Michael Jiang@DESKTOP-JUOEVVQ MINGW64 ~/Desktop/gittest (test1)
$ git branch -m test1 test1.0

Michael Jiang@DESKTOP-JUOEVVQ MINGW64 ~/Desktop/gittest (test1.0)
$

可以看出已经成功将branch的名字从test1改为test1.0

接下来对test1.0分支的代码进行一些修改

这个项目从master分支过来时只有两个文件

bigChange.sen
hello.md

现在在分支中添加一个新文件sayHello.py并修改了hello.md中的内容。

然后执行了add 和 commit

接下来就进行合并？

合并前突发奇想不如push一下branch版吧

Michael Jiang@DESKTOP-JUOEVVQ MINGW64 ~/Desktop/gittest (test1.0)
$ git push origin test1.0
Enumerating objects: 6, done.
Counting objects: 100% (6/6), done.
Delta compression using up to 6 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (4/4), 368 bytes | 184.00 KiB/s, done.
Total 4 (delta 0), reused 0 (delta 0)
remote:
remote: Create a pull request for 'test1.0' on GitHub by visiting:
remote:      https://github.com/MichaelJiang1997/GitTest/pull/new/test1.0
remote:
To github.com:MichaelJiang1997/GitTest.git
 * [new branch]      test1.0 -> test1.0

嗯。。。去Github瞅瞅（最近访问GitHub有点困难）

稳！

合并合并！！！

首先切换到想要合并到的分枝下，运行’git merge’命令 （例如本例中将test1.0分支合并到master分支的话，进入master分支运行git merge test1.0命令）如果合并顺利的话：

Michael Jiang@DESKTOP-JUOEVVQ MINGW64 ~/Desktop/gittest (master)
$ git merge test1.0
Updating d4b58f7..7b9fe0b
Fast-forward
 Hello.md    | 4 +++-
 sayHello.py | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 sayHello.py

合并成功。

在主分支git log一下

Michael Jiang@DESKTOP-JUOEVVQ MINGW64 ~/Desktop/gittest (master)
$ git log
commit 7b9fe0b7b246653ab822b6824b9157244ea0a983 (HEAD -> master, origin/test1.0, origin/master, test1.0)
Author: MichaelJiang1997 <592348268@qq.com>
Date:   Sun Sep 22 14:27:32 2019 +0800

    add say hello

commit d4b58f7e7b2cc676aefe2aaf50e8cbfd2742eb6d
Author: MichaelJiang1997 <592348268@qq.com>
Date:   Sun Sep 15 16:20:15 2019 +0800

    测试改动

commit 5e3f81db2777533ff78c28b94af987a0f81c4e11
Author: MichaelJiang1997 <592348268@qq.com>
Date:   Sun Sep 15 15:40:04 2019 +0800

    test

OK！

Related articles

Next