6.分支合并

1.准备一个新的仓库demo,编写内容并提交

mkdir demo
cd demo
git init
echo "hello">> test.txt 
git add test.txt
git commit -m "init commit"

2.创建一个名为steven的分支，并查看所有分支信息(当前分支)

git branch steven
git branch

3.切换到steven分支，并查看当前分支

git checkout steven
git branch

4.在steven分支添加新内容并提交

ls
cat test.txt
echo "world">> test.txt
cat test.txt
git add test.txt
git commit -m "branch steven commit"

5.切回master并合并steven分支代码

git checkout master
ls
cat test.txt
git merge steven
ls
cat test.txt