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

Bug 339093

Summary:	Cherry Pick: in case of conflicts a commit leads to an error
Product:	[Technology] EGit	Reporter:	Stefan Lay <stefan.lay>
Component:	Core	Assignee:	Project Inbox <egit.core-inbox>
Status:	RESOLVED FIXED	QA Contact:
Severity:	normal
Priority:	P3	CC:	robin.rosenberg, robin
Version:	0.12
Target Milestone:	---
Hardware:	All
OS:	All
Whiteboard:

Description Stefan Lay

2011-03-07 10:04:09 EST

When I have a conflict after cherry picking the commit command is enabled, but leads to an error:

org.eclipse.team.core.TeamException: Committing changes
	at org.eclipse.egit.core.op.CommitOperation$1.run(CommitOperation.java:183)
	at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1800)
	at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1782)
	at org.eclipse.egit.core.op.CommitOperation.execute(CommitOperation.java:194)
	at org.eclipse.egit.ui.internal.commit.CommitUI$2.run(CommitUI.java:237)
	at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55)
Caused by: org.eclipse.jgit.errors.NotSupportedException: Cannot work with other stages than zero right now. Won't write corrupt index.
	at org.eclipse.jgit.lib.GitIndex.checkWriteOk(GitIndex.java:349)
	at org.eclipse.jgit.lib.GitIndex.write(GitIndex.java:269)
	at org.eclipse.egit.core.op.CommitOperation.doCommits(CommitOperation.java:311)
	at org.eclipse.egit.core.op.CommitOperation.access$8(CommitOperation.java:297)
	at org.eclipse.egit.core.op.CommitOperation$1.run(CommitOperation.java:180)
	... 5 more

Comment 1 Robin Stocker

2012-10-11 16:22:27 EDT

Is this still the case?

Comment 2 Robin Rosenberg

2012-12-30 17:27:27 EST

I assume this is fixed. Commit gives a clear message that it refused to commit due to unresolved conflicts.