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/

如果merge分支出现问题，使用git方式查看日志的更多相关文章

  1. git branch查看不到分支的名字解决办法

    git branch查看不到分支的名字解决办法 <!-- 1. 先初始化 --> git init; <!-- 2. 接着创建瑶瑶的专属分支 --> git checkout ...

  2. git rebase VS git merge？ 更优雅的 git 合并方式值得拥有

    写在前面 如果你不能很好的应用 Git,那么这里为你提供一个非常棒的 Git 在线练习工具 Git Online ,你可以更直观的看到你所使用的命令会产生什么效果 另外,你在使用 Git 合并分支时只 ...

  3. Git的Bug分支----临时保存现场git stash

    软件开发中,bug就像家常便饭一样,有了bug就需要修复,在Git中,由于分支是如此的强大,所以每个bug通过一个新的分支来修复,在修复后,合并分支,然后将临时分支删除. 当你接到一个修复代号为119 ...

  4. Git新建本地分支与远程分支关联问题：git branch --set-upstream

    Git新建本地分支与远程分支关联问题:git branch --set-upstream git在本地新建分支, push到remote服务器上之后,再次pull下来的时候,如果不做处理会报以下提示: ...

  5. 1git命令的使用,查看git仓库状态,添加文件到git跟踪,git提交,查看git分支,查看git仓库日志信息,切换git分支，解决git分支合并后出现冲突的问题

    1新建一个存储git的文件夹,命令是: toto@toto-K45VD:~$ mkdir gitfolder 2初始化一个git仓库,命令是: toto@toto-K45VD:~$cd gitfold ...

  6. repo+manifests+git方式管理安卓代码

    repo+manifests+git方式管理安卓代码 1.repo的获取 repo只是google用Python脚本写的调用git的一个脚本,主要是用来下载.管理Android项目的软件仓库.(也就是 ...

  7. Git新建本地分支与远程分支关联问题：git branch --set-upstream【转】

    本文转载自:http://blog.csdn.net/netwalk/article/details/21088405 Git新建本地分支与远程分支关联问题:git branch --set-upst ...

  8. git log 查看 当前分支的 提交历史

    git log  查看 当前分支的 提交历史 在提交了若干更新之后,想回顾下提交历史,可以使用 git log 命令查看 默认不用任何参数的话,git log 会按提交时间列出所有的更新,最近的更新排 ...

  9. 删除本地git的远程分支和远程删除git服务器的分支【转】

    转- 删除本地git的远程分支和远程删除git服务器的分支 在项目中使用git管理代码后,有些时候会创建很多不同名称的分支,以此区分各个分支代码功能. 而随着代码的合并,以前的分支就可能不再需要保存了 ...

随机推荐

  1. tracert traceroute

    二者都用于探测数据包从源到目的经过路由的IP,但两者探测的方法却有差别.不同点:一.应用环境不同tracert是应用在windows下.traceroute则是应用在linux/BSD/router/ ...

  2. Spring-Cloud-Ribbon学习笔记（一）：入门

    简介 Spring Cloud Ribbon是一个基于Http和TCP的客户端负载均衡工具,它是基于Netflix Ribbon实现的.它不像服务注册中心.配置中心.API网关那样独立部署,但是它几乎 ...

  3. 【Dubbo 源码解析】03_Dubbo Protocol&Filter

    Protocol & Filter Dubbo 服务暴露和服务引用都是通过的 com.alibaba.dubbo.rpc.Protocol 来实现的.它是一个 SPI 扩展. @SPI(&qu ...

  4. greenplum 安装笔记

    折腾两天了,终于把greenplum装成功了.记录下遇到的问题. 环境变量一点要配置准确. greenplum安装,按照这里一步步走: http://www.cnblogs.com/liuyungao ...

  5. 程序中的@Override是什么意思？

    @Override是Java5的元数据,自动加上去的一个标志,告诉你说下面这个方法是从父类/接口 继承过来的,需要你重写一次,这样就可以方便你阅读,也不怕会忘记 @Override是伪代码,表示重写( ...

  6. 用lua编写wireshark插件分析自己定义的协议

    参见: https://yoursunny.com/study/IS409/ScoreBoard.htm https://wiki.wireshark.org/LuaAPI/TreeItem http ...

  7. Windows下使用VS2017搭建FLTK开发环境

    环境介绍 系统:win10 64位 IDE:VS 2017 Community FLTK版本:1.3.4-2 下载FLTK 截止到本文编写,FLTK的最新稳定版本是1.3.4-2.我们从官网(www. ...

  8. 关于linux下ntp时间同步服务的安装与配置

    1.安装ntp服务,要使用时间同步.那么服务端与客户端都需要使用如下命令安装NTP软件包 [root@ ~]# yum install ntp -y 2.如果只是作为客户端的话,配置则可以非常简单,编 ...

  9. 【CF461E】Appleman and a Game 倍增floyd

    [CF461E]Appleman and a Game 题意:你有一个字符串t(由A,B,C,D组成),你还需要构造一个长度为n的字符串s.你的对手需要用t的子串来拼出s,具体来说就是每次找一个t的子 ...

  10. tomcat启动出错 invalid LOC header

    tomcat启动出错 invalid LOC header,run as maven test 没有报错,只有警告: 'build.plugins.plugin.version' for org.ap ...