Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 333954

Summary:	TeamException logged Checkout conflict with files:
Product:	[Technology] EGit	Reporter:	James Blackburn <jamesblackburn+eclipse>
Component:	Core	Assignee:	Project Inbox <egit.core-inbox>
Status:	RESOLVED FIXED	QA Contact:
Severity:	major
Priority:	P3	CC:	caniszczyk, christian.halstrick
Version:	0.11
Target Milestone:	---
Hardware:	PC
OS:	Linux-GTK
Whiteboard:

Description James Blackburn

2011-01-11 04:28:44 EST

Eclipse EGit (Incubation)	0.11.0.201012302115	org.eclipse.egit.feature.group
  Eclipse JGit (Incubation)	0.11.0.201012302114	org.eclipse.jgit.feature.group

I found this in the Eclipse error log, and I've seen other users provoke this here too:

Checkout conflict with files: 
src/org/eclipse/cdt/internal/ui/cview/BuildGroup.java

org.eclipse.team.core.TeamException: Checkout conflict with files: 
src/org/eclipse/cdt/internal/ui/cview/BuildGroup.java
	at org.eclipse.egit.core.op.BranchOperation.checkoutTree(BranchOperation.java:186)
	at org.eclipse.egit.core.op.BranchOperation.access$4(BranchOperation.java:177)
	at org.eclipse.egit.core.op.BranchOperation$1.run(BranchOperation.java:113)
	at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1975)
	at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1957)
	at org.eclipse.egit.core.op.BranchOperation.execute(BranchOperation.java:127)
	at org.eclipse.egit.ui.internal.repository.tree.command.CheckoutCommand$1$1.run(CheckoutCommand.java:62)
	at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1975)
	at org.eclipse.egit.ui.internal.repository.tree.command.CheckoutCommand$1.run(CheckoutCommand.java:67)
	at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)

Comment 1 Chris Aniszczyk

2011-01-11 10:39:05 EST

Hrmmm... nothing stands out yet while this happens.

Comment 2 James Blackburn

2011-01-11 10:43:58 EST

I think I can reproduce this reliably. If a file is dirty(?) and would be changed by the checkout, then checking out files with this error.

Comment 3 Christian Halstrick

2011-01-12 05:15:46 EST

Can you try the latest nightly build? We now handle this error with a proper dialog explaining the situation. See http://egit.eclipse.org/r/#change,2141.

Comment 4 James Blackburn

2011-01-12 05:34:37 EST

Great - verified, thanks!