Git branch 分支与合并分支

 Git branch 分支

查看当前有哪些branch

bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotium$ git branch
* master

新建一个branch xm2.x

bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotium$ git branch xm2.x

切换到一个branch

bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotium$ git checkout xm2.x

新建并且切换到该branch,例: xm2.x

bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotium$ git checkout -b xm2.x

再次查看

bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotium$ git branch
* master
  xm2.x

添加一个文件到你的repo

bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotium$ git add bixiaopeng.txt

添加所有的文件 git add .

bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotium$ git add .

commit一个文件

bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotium$ git commit -m "bixiaopeng test case"

commit到本地

bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotium$ git commit -a -m "xm2.x test case"
[xm2.x f78f430] xm2.x test case
 39 files changed, 384 insertions(+)
 create mode 100644 AndroidManifest.xml
………….

查看几次commit的区别

bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotium$ 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 git@mirror.gitlab.*****.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 xmrobotium$ git branch -r
  origin/master
  origin/xm2.x

查看本地和远程分支

bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotium$ git branch -a
  master
* xm2.x
  remotes/origin/master
  remotes/origin/xm2.x

修改branch的名字

bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotium$ git branch -m xm2.x test2.x
bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotium$ git branch -r
  origin/master
  origin/xm2.x

查看本地和远程所有的分支

bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotium$ git branch -a
  master
* test2.x
  remotes/origin/master
  remotes/origin/xm2.x

删除远程分支

bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotium$ git push origin --delete xm2.x
remote: To git@mirror.gitlab.****.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 xmrobotium$ git status
 On branch xm3.0
nothing to commit, working directory clean
bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotium$ 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