关于Git管理工具,在从服务器端pull代码时,发生的异常信息如下!

admin 2019-3-17 148

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.Workspa十五味萝蒂明目丸ce.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.二十五味珊瑚丸 http://www.lyjiliu.com/ 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)
返回
发新帖