# 首先需要修改冲突的文件，整合两个版本的数据！
$ vi _posts/2013-5-26-markdown-stu.md

Winseliu@WINSE ~/Documents/GitHub/winse.github.com ((171a4ea...)|REBASE)
$ git status
# Not currently on any branch.
# You are currently rebasing.
#   (fix conflicts and then run "git rebase --continue")
#   (use "git rebase --skip" to skip this patch)
#   (use "git rebase --abort" to check out the original branch)
#
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add <file>..." to mark resolution)
#
#       both added:         _posts/2013-5-26-init-blog-pages.md
#       both added:         _posts/2013-5-26-markdown-stu.md
#
no changes added to commit (use "git add" and/or "git commit -a")

Winseliu@WINSE ~/Documents/GitHub/winse.github.com ((171a4ea...)|REBASE)
$ git rebase --continue
_posts/2013-5-26-init-blog-pages.md: needs merge
_posts/2013-5-26-markdown-stu.md: needs merge
You must edit all merge conflicts and then
mark them as resolved using git add

Winseliu@WINSE ~/Documents/GitHub/winse.github.com ((171a4ea...)|REBASE)
$ git add _posts/2013-5-26-init-blog-pages.md

Winseliu@WINSE ~/Documents/GitHub/winse.github.com ((171a4ea...)|REBASE)
$ git add _posts/2013-5-26-markdown-stu.md

Winseliu@WINSE ~/Documents/GitHub/winse.github.com ((171a4ea...)|REBASE)
$ git rebase --continue
Applying: hello

$ git pull
Updating ae0a812..fe592a0
error: Your local changes to the following files would be overwritten by merge:
        esw/DTA/ISMI_CU/DTA/trunk/README.md
Please, commit your changes or stash them before you can merge.
Aborting

git stash
git pull
git stash pop
// 然后可以使用git diff -w +文件名 来确认代码自动合并的情况.

winse@Lenovo-PC ~/esw/git
$ git add  esw/DTA/ISMI_CU/DTA/trunk/README.md

winse@Lenovo-PC ~/esw/git
$ git commit -m 'start  v1.0.5.5'
[master e95b61c] start  v1.0.5.5
 1 files changed, 10 insertions(+), 0 deletions(-)

winse@Lenovo-PC ~/esw/git
$ git pull
// 没有冲突直接更新ok了！