Git branch 分支與合併分支

十五. Git branch 分支
查看當前有哪些branch
bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotiumgitbranch∗master新建一個branchxm2.xbixiaopeng@bixiaopengtekiMacBook−Proxmrobotium git branch xm2.x
切換到一個branch
bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotiumgitcheckoutxm2.x新建並且切換到該branch,例:xm2.xbixiaopeng@bixiaopengtekiMacBook−Proxmrobotium git checkout -b xm2.x
再次查看
bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotiumgitbranch∗masterxm2.x添加一個文件到你的repobixiaopeng@bixiaopengtekiMacBook−Proxmrobotium git add bixiaopeng.txt
添加所有的文件 git add .
bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotiumgitadd.commit一個文件bixiaopeng@bixiaopengtekiMacBook−Proxmrobotium git commit -m “bixiaopeng test case”
commit到本地
bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotiumgitcommit−a−m“xm2.xtestcase”[xm2.xf78f430]xm2.xtestcase39fileschanged,384insertions(+)createmode100644AndroidManifest.xml………….查看幾次commit的區別bixiaopeng@bixiaopengtekiMacBook−Proxmrobotium git diff
將branch push到遠程
bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotium$ git push origin xm2.x
Counting objects: 78, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (51/51), done.
Writing objects: 100% (77/77), 565.97 KiB, done.
Total 77 (delta 3), reused 0 (delta 0)
remote: To [email protected].*.com:/home/git/repositories/xiaopeng.bxp/xmrobotium.git
remote: * [new branch] xm2.x -> xm2.x
To git@gitlab.**.com:xiaopeng.bxp/xmrobotium.git
* [new branch] xm2.x -> xm2.x
查看遠程分支
bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotiumgitbranch−rorigin/masterorigin/xm2.x查看本地和遠程分支bixiaopeng@bixiaopengtekiMacBook−Proxmrobotium git branch -a
master
* xm2.x
remotes/origin/master
remotes/origin/xm2.x
修改branch的名字
bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotiumgitbranch−mxm2.xtest2.xbixiaopeng@bixiaopengtekiMacBook−Proxmrobotium git branch -r
origin/master
origin/xm2.x
查看本地和遠程所有的分支
bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotiumgitbranch−amaster∗test2.xremotes/origin/masterremotes/origin/xm2.x刪除遠程分支bixiaopeng@bixiaopengtekiMacBook−Proxmrobotium git push origin –delete xm2.x
remote: To [email protected].**.com:/home/git/repositories/xiaopeng.bxp/xmrobotium.git
remote: - [deleted] xm2.x
To git@gitlab.*.com:xiaopeng.bxp/xmrobotium.git
- [deleted] xm2.x
bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotium$ git branch -r
origin/master
origin/test2.x
十六. Git 合併分支
首先切換到想要合併到的分枝下，運行’git merge’命令 （例如本例中將test2.x分支合併到xm3.0分支的話，進入xm3.0分支運行git merge test2.x命令）如果合併順利的話：

確保當前分支爲xm3.0
bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotiumgitstatusOnbranchxm3.0nothingtocommit,workingdirectorycleanbixiaopeng@bixiaopengtekiMacBook−Proxmrobotium git branch
master
test2.x
* xm3.0
bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotium$ git merge test2.x
Already up-to-date.
合併衝突處理：
Automatic merge failed; fix conflicts and then commit the result.

修改衝突的文件後，git add 文件 然後，git commit