id	summary	reporter	owner	description	type	status	priority	milestone	component	version	resolution	keywords	cc
2507	[Patch] Bug when merging two semantically equal version of a primitive	Gubaer	team	"||1||JOSM 1 || Server || JOSM 2||
||2||Create[[BR]]amenity=biergarten[[BR]]testkey=value1[[BR]]and upload||amenity=biergarten[[BR]]testkey=value1[[BR]]id=1[[BR]]version=1||||
||3||||amenity=biergarten[[BR]]testkey=value1[[BR]][[BR]]id=1[[BR]]version=1||Downlad[[BR]]amenity=biergarten[[BR]]testkey=value1[[BR]]id=1[[BR]]version=1||
||4||Update[[BR]]amenity=biergarten[[BR]]'''testkey=value2'''[[BR]]id=1[[BR]]version=1[[BR]]and upload||amenity=biergarten[[BR]]testkey=value2[[BR]]id=1[[BR]]version=2||||
||5||||amenity=biergarten[[BR]]testkey=value2[[BR]]version=2||Update[[BR]] amenity=biergarten[[BR]]'''testkey=value2'''[[BR]]version=1||
||6||||amenity=biergarten[[BR]]testkey=value2[[BR]]version=2||Download and merge results in[[BR]]amenity=biergarten[[BR]]testkey=value2[[BR]]'''version=1'''||
||7||||amenity=biergarten[[BR]]testkey=value2[[BR]]version=2||Update  amenity=biergarten[[BR]]testkey=value3[[BR]]version=1||
||8||||amenity=biergarten[[BR]]testkey=value2[[BR]]version=2||Upload results in a Conflict ||

The problem is in step 6. The version on the server and on the client are sematically equal (same keys, same values, same id). JOSM_2 should therefore merge the '''higher version''' into the target node. Otherwise any subsequente uploads from JOSM_2 result in a conflict."	defect	closed	major		Core	latest	fixed		Gubaer