id	summary	reporter	owner	description	type	status	priority	milestone	component	version	resolution	keywords	cc
22389	conflict and uploading	dieterdreist	team	"Consider this scenario:

1. create a relation, add a few members, ""save"" (to data layer)
2. add more members, but do not save
3. upload the relation (not saved the edit from step 2 yet)
4. close the relation editor, you get a conflict
5. resolve the conflict to the newer version

here is the bug: you cannot upload the resolved version, because the button is grayed out.
The history shows 2 members, but the ways are all in the relation and opening the relation editor shows the complete relation (see sceenshot)
"	defect	closed	normal		Core		duplicate