Eclipse git插件更新某个本地冲突文件
2017-12-01 22:21
701 查看
错误信息:
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
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
相关文章推荐
- eclipse或者mycelipse使用git插件覆盖更新本地文件
- eclipse git强制覆盖更新本地文件
- 【git】之使用eclipse-git插件查看本地文件和远程文件区别
- 使用git pull文件时和本地文件冲突怎么办?
- Eclipse的Git插件Egit: merge合并冲突具体解决方法
- Eclipse git 插件集成与本地使用
- eclipse git 插件集成与本地使用(傻瓜教程 一)
- git pull文件时和本地文件冲突的问题
- git pull 和本地文件冲突问题解决
- Eclipse的git插件冲突合并方法
- 使用git pull文件时和本地文件冲突怎么办?
- git pull时本地文件和服务器文件冲突解决方法
- git pull和本地文件冲突
- Android Eclipse之Git插件安装、配置、提交、修改、冲突、查看历史、覆盖。
- git更新文件冲突 Please, commit your changes or stash th
- 使用git pull文件时和本地文件冲突怎么办
- eclipse 自带git插件 文件提交后修改标志不明显
- 使用git pull文件时和本地文件冲突怎么办?
- 在Eclipse中,使用Aptana同步更新本地文件与FTP文件.
- Eclipse上GIT插件EGIT使用手册之八_解决推送冲突