关于Git管理工具,在从服务器端pull代码时,发生的异常信息如下!
来源:互联网 发布:淘宝挂机是什么意思 编辑:程序博客网 时间:2024/05/29 15:33
org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files:
otc-chinamoney-data-common/src/main/java/com/cmf/otc/chinamoney/data/common/core/service/OtcTradeOrderService.java
at org.eclipse.jgit.api.MergeCommand.call(MergeCommand.java:419)
at org.eclipse.jgit.api.PullCommand.call(PullCommand.java:331)
at org.eclipse.egit.core.op.PullOperation$1.run(PullOperation.java:193)
at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2240)
at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2267)
at org.eclipse.egit.core.op.PullOperation.execute(PullOperation.java:225)
at org.eclipse.egit.ui.internal.pull.PullOperationUI.execute(PullOperationUI.java:156)
at org.eclipse.egit.ui.internal.pull.PullOperationUI$1.runInWorkspace(PullOperationUI.java:131)
at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:39)
at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55)
Caused by: org.eclipse.jgit.errors.CheckoutConflictException: Checkout conflict with files:
otc-chinamoney-data-common/src/main/java/com/cmf/otc/chinamoney/data/common/core/service/OtcTradeOrderService.java
at org.eclipse.jgit.dircache.DirCacheCheckout.doCheckout(DirCacheCheckout.java:461)
at org.eclipse.jgit.dircache.DirCacheCheckout.checkout(DirCacheCheckout.java:443)
at org.eclipse.jgit.api.MergeCommand.call(MergeCommand.java:293)
otc-chinamoney-data-common/src/main/java/com/cmf/otc/chinamoney/data/common/core/service/OtcTradeOrderService.java
at org.eclipse.jgit.api.MergeCommand.call(MergeCommand.java:419)
at org.eclipse.jgit.api.PullCommand.call(PullCommand.java:331)
at org.eclipse.egit.core.op.PullOperation$1.run(PullOperation.java:193)
at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2240)
at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2267)
at org.eclipse.egit.core.op.PullOperation.execute(PullOperation.java:225)
at org.eclipse.egit.ui.internal.pull.PullOperationUI.execute(PullOperationUI.java:156)
at org.eclipse.egit.ui.internal.pull.PullOperationUI$1.runInWorkspace(PullOperationUI.java:131)
at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:39)
at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55)
Caused by: org.eclipse.jgit.errors.CheckoutConflictException: Checkout conflict with files:
otc-chinamoney-data-common/src/main/java/com/cmf/otc/chinamoney/data/common/core/service/OtcTradeOrderService.java
at org.eclipse.jgit.dircache.DirCacheCheckout.doCheckout(DirCacheCheckout.java:461)
at org.eclipse.jgit.dircache.DirCacheCheckout.checkout(DirCacheCheckout.java:443)
at org.eclipse.jgit.api.MergeCommand.call(MergeCommand.java:293)
... 9 more
解决方案:
Checkout conflict with files:后面会提示你哪些文件冲突解决办法就是找到冲突的文件, 右击 team -> advanced -> assume unchanged然后 team -> Pull 问题解决
当你暂时不想提交代码的时候,也可以这么操作!!
如果又想提交代码的话(前提已经点了assume unchanged),点击( team -> advanced ->not assume unchanged)即可!
阅读全文
0 0
- 关于Git管理工具,在从服务器端pull代码时,发生的异常信息如下!
- Git使用手册:git pull origin 拉取代码到本地,解决拉取代码时发生的文件冲突
- android studio 用git从远程仓库pull和push发生的错误
- git pull 报如下错误
- 代码管理工具git的使用
- Demo1.从服务器获取信息 服务器端代码
- “System.NotSupportedException”类型的异常在 System.Data.Entity.dll 中发生,但未在用户代码中进行处理 其他信息: 在 LINQ to Entitie
- 高性能的通讯程序,服务器端的代码大致如下:
- [Git]关于Pull Request的十个建议
- 关于git的pull与push
- Git关于pull,commit,push的总结
- Git关于pull,commit,push的总结
- 从github pull 下的项目在环境中不能使用异常
- 我在npm install express时发生如下错误
- Windows上的代码管理工具git分享
- git.oschina免费的、分布式代码管理工具
- 代码管理工具git端遇到的问题
- 关于版本管理工具 git 的具体使用
- 深圳P2P:有了银行存管也不一定安全
- NLTK10《Python自然语言处理》code09 建立基于特征的文法
- Python 字符串大小写转换,值域范围
- 全国环游怎么走----蚁群算法
- (项目笔记)<include>与<jsp:param>配合 传值
- 关于Git管理工具,在从服务器端pull代码时,发生的异常信息如下!
- 剑指Offer-60
- HttpURLConnection从客户端向服务器发送Http请求以及服务器响应全过程解析
- Groovy方法注入
- call,apply,bind的联系与区别
- 关于HTTP和HTTPS的安全问题
- LeeNet分类网络(ImageNet100:top1-73.44%,top5-91.40%,CPU_forward-30ms,model_size-2.7M)
- NMOS管G端电平异常,求解释
- Android选择颜色,尺码联动