Eclipse git插件更新某个本地冲突文件

错误信息：

org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files: 
taotao-manager/taotao-manager-web/src/main/resources/resource/env.properties
at org.eclipse.jgit.api.MergeCommand.call(MergeCommand.java:424)
at org.eclipse.jgit.api.PullCommand.call(PullCommand.java:353)
at org.eclipse.egit.core.op.PullOperation$1.run(PullOperation.java:200)
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:232)
at org.eclipse.egit.ui.internal.pull.PullOperationUI.execute(PullOperationUI.java:176)
at org.eclipse.egit.ui.internal.pull.PullOperationUI.access$0(PullOperationUI.java:168)
at org.eclipse.egit.ui.internal.pull.PullOperationUI$1.runInWorkspace(PullOperationUI.java:141)
at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:39)
at org.eclipse.core.internal.jobs.Worker.run(Worker.java:56)
Caused by: org.eclipse.jgit.errors.CheckoutConflictException: Checkout conflict with files: 
taotao-manager/taotao-manager-web/src/main/resources/resource/env.properties
at org.eclipse.jgit.dircache.DirCacheCheckout.doCheckout(DirCacheCheckout.java:467)
at org.eclipse.jgit.dircache.DirCacheCheckout.checkout(DirCacheCheckout.java:449)
at org.eclipse.jgit.api.MergeCommand.call(MergeCommand.java:297)
... 10 more

库里有几个文件,本地调试的时候经常要改,但改动的内容不能提交到库里,每次commit时都要把这几个文件去掉再提交,很费时间, 查了下发现git有三个方法可以在提交列表里忽略掉指定文件:.gitignore file / assume-unchanged / skip-worktree

解决方法：

选中冲突文件 Team--》Advanced --》 Assume Unchanged