如果merge分支出现问题，使用git方式查看日志

Administrator@IT-20161115IKEG MINGW32 ~
$ cd e:

Administrator@IT-20161115IKEG MINGW32 /e
$ ls
$RECYCLE.BIN/          ideaworkspace/  System Volume Information/
BaiduNetdiskDownload/  MyDownloads/    VMware workstation/

Administrator@IT-20161115IKEG MINGW32 /e
$ cd ideaworkspace/

Administrator@IT-20161115IKEG MINGW32 /e/ideaworkspace
$ ls
4.0.2/                xiaofool_ms_4_0.rar
xiaofool/             xiaofool_ms_4_0dev/
xiaofool_docs_4_0/    xiaofool_ms_4_0yangyu/
xiaofool_engine_4_0/  xiaofool_ms_4_0是修改分类之前的备份/
xiaofool_ms_4_0/      xiaofool_ms_4_0修复杨宇分支版本/

Administrator@IT-20161115IKEG MINGW32 /e/ideaworkspace
$ cd xiaofool
xiaofool/                            xiaofool_ms_4_0dev/
xiaofool_docs_4_0/                   xiaofool_ms_4_0yangyu/
xiaofool_engine_4_0/                 xiaofool_ms_4_0是修改分类之前的备份/
xiaofool_ms_4_0/                     xiaofool_ms_4_0修复杨宇分支版本/
xiaofool_ms_4_0.rar

Administrator@IT-20161115IKEG MINGW32 /e/ideaworkspace
$ cd xiaofool_ms_4_0

Administrator@IT-20161115IKEG MINGW32 /e/ideaworkspace/xiaofool_ms_4_0 (yangyu_2                                                                                                                0170317_dev)
$ ls
Development_Specification  xf-ms-common/  xf-ms-service/  xf-ms-web/
pom.xml                    xf-ms-dao/     xf-ms-solr/

Administrator@IT-20161115IKEG MINGW32 /e/ideaworkspace/xiaofool_ms_4_0 (yangyu_2                                                                                                                0170317_dev)
$ git status
On branch yangyu_20170317_dev
Your branch is up-to-date with 'origin/yangyu_20170317_dev'.
Untracked files:
  (use "git add <file>..." to include in what will be committed)

        xf-ms-solr/target/

nothing added to commit but untracked files present (use "git add" to track)

Administrator@IT-20161115IKEG MINGW32 /e/ideaworkspace/xiaofool_ms_4_0 (yangyu_2                                                                                                                0170317_dev)
$ git branch
  dev
* yangyu_20170317_dev

Administrator@IT-20161115IKEG MINGW32 /e/ideaworkspace/xiaofool_ms_4_0 (yangyu_20170317_dev)
$ git checkout dev
Switched to branch 'dev'
Your branch is up-to-date with 'origin/dev'.

Administrator@IT-20161115IKEG MINGW32 /e/ideaworkspace/xiaofool_ms_4_0 (dev)
$ git status
On branch dev
Your branch is up-to-date with 'origin/dev'.
Untracked files:
  (use "git add <file>..." to include in what will be committed)

        xf-ms-solr/target/

nothing added to commit but untracked files present (use "git add" to track)

Administrator@IT-20161115IKEG MINGW32 /e/ideaworkspace/xiaofool_ms_4_0 (dev)
$ git checkout yangyu_20170317_dev
dev                                 ORIG_HEAD                           origin/production                   production                          yangyu_20170317_dev
dev_knowledge_learn_backup          origin/dev                          origin/test                         test
FETCH_HEAD                          origin/dev_knowledge_learn_backup   origin/xf-ms-cluster                test1.0
HEAD                                origin/HEAD                         origin/yangyu_20170317_dev          xf-ms-cluster

Administrator@IT-20161115IKEG MINGW32 /e/ideaworkspace/xiaofool_ms_4_0 (dev)
$ git checkout yangyu_20170317_dev
Switched to branch 'yangyu_20170317_dev'
Your branch is up-to-date with 'origin/yangyu_20170317_dev'.

Administrator@IT-20161115IKEG MINGW32 /e/ideaworkspace/xiaofool_ms_4_0 (yangyu_20170317_dev)
$ git merge dev
Removing xf-ms-web/src/test/java/cn/dinfo/xf/service/workflow/WorkflowTest.java
Auto-merging xf-ms-web/src/test/java/cn/dinfo/xf/service/solr/TestKnowledgeInfoService.java
CONFLICT (content): Merge conflict in xf-ms-web/src/test/java/cn/dinfo/xf/service/solr/TestKnowledgeInfoService.java
Auto-merging xf-ms-web/src/test/java/cn/dinfo/xf/service/knowledge_management/TestKnowledgeService.java
Auto-merging xf-ms-web/src/main/webapp/views/js/knowledge/knowledgeOverview.js
CONFLICT (content): Merge conflict in xf-ms-web/src/main/webapp/views/js/knowledge/knowledgeOverview.js
Removing xf-ms-web/src/main/java/cn/dinfo/xf/controller/knowledge_management/WorkflowController.java
Auto-merging xf-ms-solr/src/main/java/cn/dinfo/xf/solr/repository/knowledge_base/KnowledgeBaseServiceImpl.java
CONFLICT (content): Merge conflict in xf-ms-solr/src/main/java/cn/dinfo/xf/solr/repository/knowledge_base/KnowledgeBaseServiceImpl.java
Auto-merging xf-ms-solr/src/main/java/cn/dinfo/xf/solr/repository/knowledge_base/KnowledgeBaseService.java
CONFLICT (content): Merge conflict in xf-ms-solr/src/main/java/cn/dinfo/xf/solr/repository/knowledge_base/KnowledgeBaseService.java
Auto-merging xf-ms-solr/src/main/java/cn/dinfo/xf/solr/repository/knowledge/KnowledgeInfoServiceImpl.java
CONFLICT (content): Merge conflict in xf-ms-solr/src/main/java/cn/dinfo/xf/solr/repository/knowledge/KnowledgeInfoServiceImpl.java
Auto-merging xf-ms-solr/src/main/java/cn/dinfo/xf/solr/repository/knowledge/KnowledgeInfoService.java
Removing xf-ms-service/src/main/java/cn/dinfo/xf/service/workflow/impl/WorkFlowServiceImpl.java
Removing xf-ms-service/src/main/java/cn/dinfo/xf/service/workflow/impl/KnowItemTaskHelper.java
Removing xf-ms-service/src/main/java/cn/dinfo/xf/service/workflow/impl/CompleteKnowItem.java
Removing xf-ms-service/src/main/java/cn/dinfo/xf/service/workflow/WorkFlowService.java
Auto-merging xf-ms-service/src/main/java/cn/dinfo/xf/service/knowledge_management/impl/KnowledgeServiceImpl.java
CONFLICT (content): Merge conflict in xf-ms-service/src/main/java/cn/dinfo/xf/service/knowledge_management/impl/KnowledgeServiceImpl.java
Auto-merging xf-ms-common/src/main/java/cn/dinfo/xf/common/Constant.java
Auto-merging pom.xml
Automatic merge failed; fix conflicts and then commit the result.

Administrator@IT-20161115IKEG MINGW32 /e/ideaworkspace/xiaofool_ms_4_0 (yangyu_20170317_dev|MERGING)
$ ls
Development_Specification  pom.xml  xf-ms-common/  xf-ms-dao/  xf-ms-service/  xf-ms-solr/  xf-ms-web/