如果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/
如果merge分支出现问题，使用git方式查看日志的更多相关文章
- git branch查看不到分支的名字解决办法
git branch查看不到分支的名字解决办法 <!-- 1. 先初始化 --> git init; <!-- 2. 接着创建瑶瑶的专属分支 --> git checkout ...
- git rebase VS git merge？ 更优雅的 git 合并方式值得拥有
写在前面 如果你不能很好的应用 Git,那么这里为你提供一个非常棒的 Git 在线练习工具 Git Online ,你可以更直观的看到你所使用的命令会产生什么效果 另外,你在使用 Git 合并分支时只 ...
- Git的Bug分支----临时保存现场git stash
软件开发中,bug就像家常便饭一样,有了bug就需要修复,在Git中,由于分支是如此的强大,所以每个bug通过一个新的分支来修复,在修复后,合并分支,然后将临时分支删除. 当你接到一个修复代号为119 ...
- Git新建本地分支与远程分支关联问题：git branch --set-upstream
Git新建本地分支与远程分支关联问题:git branch --set-upstream git在本地新建分支, push到remote服务器上之后,再次pull下来的时候,如果不做处理会报以下提示: ...
- 1git命令的使用,查看git仓库状态,添加文件到git跟踪,git提交,查看git分支,查看git仓库日志信息,切换git分支，解决git分支合并后出现冲突的问题
1新建一个存储git的文件夹,命令是: toto@toto-K45VD:~$ mkdir gitfolder 2初始化一个git仓库,命令是: toto@toto-K45VD:~$cd gitfold ...
- repo+manifests+git方式管理安卓代码
repo+manifests+git方式管理安卓代码 1.repo的获取 repo只是google用Python脚本写的调用git的一个脚本,主要是用来下载.管理Android项目的软件仓库.(也就是 ...
- Git新建本地分支与远程分支关联问题：git branch --set-upstream【转】
本文转载自:http://blog.csdn.net/netwalk/article/details/21088405 Git新建本地分支与远程分支关联问题:git branch --set-upst ...
- git log 查看 当前分支的 提交历史
git log 查看 当前分支的 提交历史 在提交了若干更新之后,想回顾下提交历史,可以使用 git log 命令查看 默认不用任何参数的话,git log 会按提交时间列出所有的更新,最近的更新排 ...
- 删除本地git的远程分支和远程删除git服务器的分支【转】
转- 删除本地git的远程分支和远程删除git服务器的分支 在项目中使用git管理代码后,有些时候会创建很多不同名称的分支,以此区分各个分支代码功能. 而随着代码的合并,以前的分支就可能不再需要保存了 ...
随机推荐
- css3+svg实现波浪图
<!DOCTYPE html> <html> <head> <meta charset=utf-8> <title>css+svg实现波浪图 ...
- new和delete操作符
C 语言中提供了 malloc 和 free 两个系统函数, 完成对堆内存的申请和释放.而 C++则提供了两个操作符 new 和 delete. 1. newnew 分配内存空间时, 分配内存空间大 ...
- 开始学习Functional Programming
打算先学F#, 再学Scala. 第一个F#程序 open System [<EntryPoint>] let main argv = let a = "Hello, World ...
- go语言调用append之后是否重新分配内存？
查看tidb源代码:::util/charset/charset.go,下面有段代码: // GetAllCharsets gets all charset descriptions in the l ...
- C# 多线程中经常访问同一资源可能造成什么问题?
竞态条件和死锁. 如果两个或多个线程访问相同的对象,或者访问不同步的共享状态 ,就会出现竞态条件: 为了避免出现该问题,可以锁定共享的对象.但是过多的锁定也会有麻烦,那就是死锁: 当至少有两个线程被挂 ...
- 阻止a链接跳转方法总结
总结下a标签阻止默认行为的几种简单方法(1) <a href="javascript:void(0);" > 点我 </a> onclick方法负责执行js ...
- Linux下批量Kill多个进程
ps -ef|grep php|grep -v grep|cut -c 9-15|xargs kill -9 管道符"|"用来隔开两个命令,管道符左边命令的输出会作为管道符右边命令 ...
- [原]Jenkins(十八) jenkins再出发之jenkins 内置变量
1.选择一个project的config选项: 2.选择build选项卡,选择Execute Windows batch command 3.会出现一个内置变量的list 连接按钮: 4.list表内 ...
- shell 递归枚举文件并操作
递归枚举文件并操作 #!/bin/bash CURDIR=$(cd $(dirname $0); pwd) export GOPATH=$CURDIR/.. echo GOPATH=$GOPATH c ...
- memcached解压报错gzip: stdin: not in gzip format tar: Child returned status 1 tar: Error is not recoverable: exiting now的解决方法
最近在部署环境,在安装memcached的过程中解压时, 解压命令:tar -zvxf memcached-1.4.34.tar.gz 遇到了一个问题, gzip: stdin: not in gzi ...