id	summary	reporter	owner	description	type	status	priority	milestone	component	version	resolution	keywords	cc
18838	"merge layer/selection: too many conflicts created and wrong user for ""their"" displayed"	skyper	team	"I encountered this merging selection but as demo merge layer is easier and produces the same results.

==== What steps will reproduce the problem?
1. Have the same way in two data layer
1. modify the position of its children differently in both layers. See example [attachment:Merge.joz]
1. merge layers 

==== What is the expected result?
* Only conflict on nodes
* the user should be the same for both ""my"" and ""their""

==== What happens instead?
* Conflict on way
* user on ""their"" is displayed from previous version and likly wrong

==== Please provide any additional information below. Attach a screenshot if possible.

{{{
Relative:URL: ^/trunk
Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Last:Changed Date: 2020-03-01 01:02:24 +0100 (Sun, 01 Mar 2020)
Revision:15969
Build-Date:2020-03-01 02:30:56
URL:https://josm.openstreetmap.de/svn/trunk
}}}
"	defect	new	normal		Core			template_report conflict merge user