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)
... 9 more
解决方案：
Checkout conflict with files:后面会提示你哪些文件冲突解决办法就是找到冲突的文件, 右击 team -> advanced -> assume unchanged然后 team -> Pull 问题解决
当你暂时不想提交代码的时候，也可以这么操作！！
如果又想提交代码的话（前提已经点了assume unchanged），点击（ team -> advanced ->not assume unchanged）即可！
