git pull Checkout conflict with files:

来源：互联网发布：怎么样做好淘宝编辑：程序博客网时间：2024/06/04 19:18

org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files:
shianyun/consumer-test/src/main/java/com/meyoung/shianyun/consumer/service/login/UserRegisterService.java
at org.eclipse.jgit.api.MergeCommand.call(MergeCommand.java:413)
at org.eclipse.jgit.api.PullCommand.call(PullCommand.java:329)
at org.eclipse.egit.core.op.PullOperation$1.run(PullOperation.java:106)
at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2241)
at org.eclipse.egit.core.op.PullOperation.execute(PullOperation.java:137)
at org.eclipse.egit.ui.internal.pull.PullOperationUI.execute(PullOperationUI.java:140)
at org.eclipse.egit.ui.internal.pull.PullOperationUI$1.runInWorkspace(PullOperationUI.java:115)
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:
shianyun/consumer-test/src/main/java/com/meyoung/shianyun/consumer/service/login/UserRegisterService.java
at org.eclipse.jgit.dircache.DirCacheCheckout.doCheckout(DirCacheCheckout.java:414)
at org.eclipse.jgit.dircache.DirCacheCheckout.checkout(DirCacheCheckout.java:396)
at org.eclipse.jgit.api.MergeCommand.call(MergeCommand.java:288)

... 8 more

Checkout conflict with files:后面会提示你哪些文件冲突解决办法就是找到冲突的文件, 右击 team -> advanced -> assume unchanged然后 team -> Pull 问题解决

1 3