Git（二）

$ git branch dev    # 建立 dev 分支$ git branch        # 查看当前分支# 输出  dev       * master    # * 代表了当前的 HEAD 所在的分支

$ git checkout dev# 输出Switched to branch 'dev'--------------------------$ git branch# 输出* dev       # 这时 HEAD 已经被切换至 dev 分支  master

删除分支

git branch -d dev

$ git checkout -b  dev# 输出Switched to a new branch 'dev'--------------------------$ git branch# 输出* dev       # 这时 HEAD 已经被切换至 dev 分支  master

我们在 1.py 上加入这一行 # I was changed in dev branch, 然后再 commit:

$ git commit -am "change 3 in dev"  # "-am": add 所有改变 并直接 commit

$ git checkout master   # 切换至 master 才能把其他分支合并过来$ git merge dev         # 将 dev merge 到 master 中$ git log --oneline --graph# 输出* f9584f8 change 3 in dev* 47f167e back to change 1 and add comment for 1.py* 904e1ba change 2* c6762a1 change 1* 13be9a7 create 1.py

$ git merge --no-ff -m "keep merge info" dev         # 保留 merge 信息$ git log --oneline --graph# 输出*   c60668f keep merge info|\  | * f9584f8 change 3 in dev         # 这里就能看出, 我们建立过一个分支|/  * 47f167e back to change 1 and add comment for 1.py* 904e1ba change 2* c6762a1 change 1* 13be9a7 create 1.py

$ git branch  dev* master-------------------------$ git merge dev# 输出Auto-merging 1.pyCONFLICT (content): Merge conflict in 1.pyAutomatic merge failed; fix conflicts and then commit the result.

git merge devgit commit -am "solve conflict"git log --oneline --graph