Skip to content

Latest commit

 

History

History
75 lines (61 loc) · 2.69 KB

4.Git分支.md

File metadata and controls

75 lines (61 loc) · 2.69 KB

分支

  • 创建分支：git branch [分支名]
  • 查看分支：git branch -v
  • 切换分支：git checkout [分支名]
  • 合并分支

先要切换到接受方分支上：git checkout [被合并分支] 合并：git merge [新内容的分支]

  • 示例
ming@ming MINGW64 /d/WorkSpace/StudyFolder/GitStudy (master)
$ git status						//当前仅有master分支
On branch master
nothing to commit, working tree clean

ming@ming MINGW64 /d/WorkSpace/StudyFolder/GitStudy (master)
$ git branch export					//创建export分支

ming@ming MINGW64 /d/WorkSpace/StudyFolder/GitStudy (master)
$ git branch -v						//查看分支状况
  export e858852 fen zhi
* master e858852 fen zhi

ming@ming MINGW64 /d/WorkSpace/StudyFolder/GitStudy (master)
$ git checkout export               //切换到export分支
Switched to branch 'export'

ming@ming MINGW64 /d/WorkSpace/StudyFolder/GitStudy (export)
$ git reflog						//export分支与master分支内容相同
e858852 (HEAD -> export, master) HEAD@{0}: checkout: moving from master to export
e858852 (HEAD -> export, master) HEAD@{1}: commit: fen zhi
f9d2672 HEAD@{2}: commit: [A] new 4.git
7f121d3 HEAD@{3}: reset: moving to 7f121d3
66b80af HEAD@{4}: reset: moving to 66b80af
7f121d3 HEAD@{5}: commit: [r] rm aaa.txt
66b80af HEAD@{6}: reset: moving to 66b80af
05be24b HEAD@{7}: reset: moving to 05be24b
66b80af HEAD@{8}: commit: [A] new aaa.txt
05be24b HEAD@{9}: reset: moving to HEAD
05be24b HEAD@{10}: commit: 3.git version
e0585e8 HEAD@{11}: reset: moving to e0585e8
fa514ff HEAD@{12}: reset: moving to fa514ff
e0585e8 HEAD@{13}: commit: my second commit
fa514ff HEAD@{14}: commit: my second commit
1a6dd4d HEAD@{15}: commit (initial): my first commit

ming@ming MINGW64 /d/WorkSpace/StudyFolder/GitStudy (export)
$ git status						
On branch export
nothing to commit, working tree clean

ming@ming MINGW64 /d/WorkSpace/StudyFolder/GitStudy (export)
$ git add .							//在export分支上add

ming@ming MINGW64 /d/WorkSpace/StudyFolder/GitStudy (export)
$ git commit -m "commit on export"  //在export分支上commit
On branch export
nothing to commit, working tree clean

ming@ming MINGW64 /d/WorkSpace/StudyFolder/GitStudy (export)
$ git checkout master		//合并分支第一步，切换到master
Switched to branch 'master'

ming@ming MINGW64 /d/WorkSpace/StudyFolder/GitStudy (master)
$ git merge export			//合并分支第二步,将export合并过来
Already up to date.

解决分支冲突

  • 打开文件后，解决掉冲突的地方，保存文件；
  • 使用命令git add [文件名]将该文件标记为冲突已解决；
  • 使用命令git commit -m "log info"，注意命令后面能不带文件名；