git 解决冲突之 theirs & ours

git merge

从feature分支合并到master分支

$ git checkout master 
$ git merge feature 

Auto-merging Document 
CONFLICT (content): Merge conflict in $codefile
Automatic merge failed; fix conflicts and then commit the result.

你可以手动解决$codefile冲突，或者

$ git checkout --ours $codefile

选择master的版本来解决冲突

$ git checkout --theirs $codefile

选择feature版本来解决冲突

然后添加冲突文件为已解决并继续

$ git add $codefile 
$ git merge --continue 

[master 5d01884] Merge branch 'feature' 

git rebase

let's rebase conflicting branch feature over master
解决master变基时feature分支

$ git checkout feature 
$ git rebase master 

First, rewinding head to replay your work on top of it... 
Applying: a commit done in branch feature 
error: Failed to merge in the changes. 
...

either fix the conflict manually by editing $codefile, or use

$ git checkout --ours $codefile

选择master分支版本来解决冲突

$ git checkout --theirs $codefile

选择feature分支版本来解决冲突

然后解决冲突，继续

$ git add $codefile
$ git rebase --continue 

Applying: a commit done in branch feature