View git repository branch: git branch
git branch -a view all branch warehouses
git branch branch name to create a new branch
git checkout branch name: switch the current branch
git branch -m old branch name the new branch name; change the branch name
git branch -d branch name: delete the merged branch
git merge branch name: Merge branch
First with the branch you want to checkout incorporated in the running merge command
When two different branches, there is the same portion of the same file are different modifications, Git will produce a merge conflict.