1.創建與合並沖突

$ git checkout -b dev

$ git branch dev
$ git checkout dev

$ git branch

$ git checkout master

$ git merge dev

$ git branch -d dev

2.解決沖突

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

4 bug分支

$ git stash

$ git stash list

git stash apply

git stash drop

git stash pop

$ git stash apply stash@{0}

5 feature分支

$ git branch -D feature-vulcan

6 多人協作

$ git pull

$ git branch --set
 
-upstream dev origin/dev

$ git remote -v

GIT常用命令-分支管理