git merge合并分支解决冲突

Question:                                                                                               
# git merge master     // 把master分支合并到当前分支
Auto-merging src/caffe/test/test_eltwise_layer.cpp
Auto-merging src/caffe/layers/eltwise_layer.cu
Auto-merging src/caffe/layers/eltwise_layer.cpp
Auto-merging docs/index.md
CONFLICT (content): Merge conflict in docs/index.md
Auto-merging docs/_layouts/default.html
CONFLICT (content): Merge conflict in docs/_layouts/default.html
Automatic merge failed; fix conflicts and then commit the result.
# git merge master
error: merge is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
--------
Solution:
# git status
# git add docs/_layouts/default.html  docs/index.md
# git commit "Add these two files."
# git merge master
Already up-to-date.