id	summary	reporter	owner	description	type	status	priority	milestone	component	version	resolution	keywords	cc
3296	java.lang.IllegalStateException during conflict upload in 1980	phobie	team	"I got a IllegalStateException during the upload of outdated, conflicting data.

What I did:
 - downloaded several potions of data
 - edited for longer time
 - tried to upload the changes
 - got a conflict warning
 - selected ""only resolve the conflicting relation 20585""
 - clicked on ""File"" -> ""Update Data""
 - used the conflict resolution gui and discarded my changes
 - uploaded again
"	defect	closed	normal		Core	latest	worksforme	conflict, upload