id	summary	reporter	owner	description	type	status	priority	milestone	component	version	resolution	keywords	cc
2628	conflict dialog does not show any version to choose from	p-h.theunissen@…	team	"met a conflict with id: 32020106 which is ver 2 in my data layer while 3 on the server.
made an update which warns me of the conflict
push then the button resolve which open the conflict resolution dialog but nothing is shown under nor my version neither under their version while it is written left high that there is 1 object in conflict. 
I stuck as I can not find other way to recover from thsi out of synch situation
Thanks for your assistance
can not  upload a file as too big"	defect	closed	major		Core		duplicate	conflict resolution	Gubaer