解决git冲突

当别人push了内容，你没先pull回来合并，就直接push时

 

git push

To github.com:muyebaiya/differFile.git

 ! [rejected]        master -> master (fetch first)

error: failed to push some refs to 'git@github.com:muyebaiya/differFile.git'

hint: Updates were rejected because the remote contains work that you do

hint: not have locally. This is usually caused by another repository pushing

hint: to the same ref. You may want to first integrate the remote changes

hint: (e.g., 'git pull ...') before pushing again.

hint: See the 'Note about fast-forwards' in 'git push --help' for details.

更新被拒绝，因为远程版本库包含您本地尚不存在的提交。这通常是因为另外一个版本库已推送了相同的引用。再次推送前，您可能需要先合并远程变更。

 

git pull

remote: Enumerating objects: 5, done.

remote: Counting objects: 100% (5/5), done.

remote: Compressing objects: 100% (2/2), done.

remote: Total 3 (delta 0), reused 3 (delta 0), pack-reused 0

Unpacking objects: 100% (3/3), done.

From github.com:muyebaiya/differFile

   e4afca0..5836d71  master     -> origin/master

Auto-merging file.txt

CONFLICT (content): Merge conflict in file.txt

Automatic merge failed; fix conflicts and then commit the result.

 

git diff

 

手工合并文件，得到最后想提交的文件

 

git add file.txt

git commit -m "modify commit"

git push