id	summary	reporter	owner	description	type	status	priority	milestone	component	version	resolution	keywords	cc
12365	Better deal with conflicts on deleted nodes	naoliv	team	"Open the attached example file and select the way.
Then revert changeset `36550386` (choose ""Revert selection only"")
When asked to download objects outside the current data, say yes.

There will be 2 conflicts, like this:

[[Image(http://i.imgur.com/5vioZMR.png)]]

Some cases where I guess this could be improved.

'''a)''' Choose the coordinates from ""Their version"":
[[Image(http://i.imgur.com/T4iF5sA.png)]]

Note how the ""Deleted state"" still needs to be defined.
Of course it doesn't make sense to choose ""deleted"" from ""My version"" (as there is no logic in setting a coordinate and also setting the object as deleted):

[[Image(http://i.imgur.com/LTPxr4i.png)]]

'''====='''

'''b)''' Choose ""not deleted"" from ""Their version"":
[[Image(http://i.imgur.com/nXik2AB.png)]]

We can see that we now have only one choice here: to choose ""Their version"" for coordinates. If there is only one choice, it should also be automatically selected too.

'''====='''

In both cases, when selecting any value from ""Their version"", the other value should also be automatically chosen, exactly like we have if we choose ""deleted"" from ""My version""

JOSM:
{{{
URL:http://josm.openstreetmap.de/svn/trunk
Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Last:Changed Date: 2016-01-13 23:58:45 +0100 (Wed, 13 Jan 2016)
Build-Date:2016-01-14 02:33:06
Revision:9436
Relative:URL: ^/trunk

Identification: JOSM/1.5 (9436 pt_BR) Linux Debian GNU/Linux testing (stretch)
Memory Usage: 533 MB / 9102 MB (336 MB allocated, but free)
Java version: 1.8.0_72-internal-b05, Oracle Corporation, OpenJDK 64-Bit Server VM
VM arguments: [-Dawt.useSystemAAFontSettings=on]
}}}"	enhancement	new	normal		Core			conflict