版本控制工具git(解決衝突)
人生不如意之事十之八九,合併分支往往也不是一帆風順的。
準備新的feature1分支,繼續我們的新分支開發:
$ git checkout -b feature1Switched to a new branch 'feature1'
修改readme.txt最後一行,改為:
Creating a new branch is quick AND simple.
在feature1分支上提交:
$ git add readme.txt$ git commit -m "AND simple"[feature1 75a857c] AND simple 1 file changed, 1 insertion(+), 1 deletion(-)
切換到master分支:
Advertisements
$ git checkout masterSwitched to branch 'master'Your branch is ahead of 'origin/master' by 1 commit.
Git還會自動提示我們當前master分支比遠程的master分支要超前1個提交。
在master分支上把readme.txt文件的最後一行改為:
Creating a new branch is quick & simple.
提交:
$ git add readme.txt$ git commit -m "& simple"[master 400b400] & simple 1 file changed, 1 insertion(+), 1 deletion(-)
現在,master分支和feature1分支各自都分別有新的提交,變成了這樣:
Advertisements
這種情況下,Git無法執行「快速合併」,只能試圖把各自的修改合併起來,但這種合併就可能會有衝突,我們試試看:
$ git merge feature1Auto-merging readme.txtCONFLICT (content): Merge conflict in readme.txtAutomatic merge failed; fix conflicts and then commit the result.
果然衝突了!Git告訴我們,readme.txt文件存在衝突,必須手動解決衝突后再提交。git status
也可以告訴我們衝突的文件:
$ git status# On branch master# Your branch is ahead of 'origin/master' by 2 commits.## Unmerged paths:# (use "git add/rm <file>..." as appropriate to mark resolution)## both modified: readme.txt#no changes added to commit (use "git add" and/or "git commit -a")
我們可以直接查看readme.txt的內容:
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.<<<<<<< HEADCreating a new branch is quick & simple.=======Creating a new branch is quick AND simple.>>>>>>> feature1
Git用<<<<<<<,=======,>>>>>>>標記出不同分支的內容,我們修改如下后保存:
Creating a new branch is quick and simple.
再提交:
$ git add readme.txt$ git commit -m "conflict fixed"[master 59bc1cb] conflict fixed
現在,master分支和feature1
分支變成了下圖所示:
用帶參數的git log也可以看到分支的合併情況:
$ git log --graph --pretty=oneline --abbrev-commit* 59bc1cb conflict fixed|\| * 75a857c AND simple* | 400b400 & simple|/* fec145a branch test...
最後,刪除feature1分支:
$ git branch -d feature1Deleted branch feature1 (was 75a857c).
小結
當Git無法自動合併分支時,就必須首先解決衝突。解決衝突后,再提交,合併完成。
用git log --graph命令可以看到分支合併圖