id	summary	reporter	owner	description	type	status	priority	milestone	component	version	resolution	keywords	cc
2510	[Patch] ConflictItem - Refactoring	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=value3'''[[BR]]version=1||
||6||||amenity=biergarten[[BR]]testkey=value2[[BR]]version=2||Download and merge results in a conflict as expected||
||7||||Resolve conflict and decide to keep ''my value'', i.e. testkey=value3 ||
||8||||Upload results in 409 conflict. Local version is still version  1||


The problem is in step 7. If the user decides to keep his value the local version is not updated to the higher version from the server.

See patch for a fix.

"	enhancement	reopened	minor		Core	latest		conflict resolution merge	Gubaer