﻿id	summary	reporter	owner	description	type	status	priority	milestone	component	version	resolution	keywords	cc
7293	conflict when replacing a way in an inclomplete loaded relation with a new way	mdk	team	"I have changed a relation (156332) by adding a landuse=forest and replacing a way. While uploading I got a conflict error. I choose to syncronize only the relation which results in a conflict entry in the conflict view. I select the relation and let me show the history (see attachment).

The last two entries in the version list cause the conflict, but they don't make any sense:
Version 5 is correct (my edit which I upload in changeset 10447743).
But the last entry is Version 4 (again, but not 6). In the list it had the same user and date as the other version 4 entry. But on the right most panel where the details of the last version are shown, there is my e-mail addess as user (instead of my username as in the middle panel) and the dialog is telling me, that the version I'm editing is not equal to the version I've uploaded right now.
* Why do I have to user name (mdk and kleidt@...)?
* Why dose JOSM or the server tell me there is a conflict in this relation?

I got these errors from time to time and the only solution is to ignore them and close the changeset (which contains the right data).

By the way, there is an other problem: If I synchronize all in this situation, I got a huge list of conflicts containing only messages which say:
* My version: Deleted, and some tags, which the object had, before deletion.
* Version on Server: also Deleted, but the tags are missing (because the DB stores a deleted object without tags)

If both are deleted, it makes no sense show me a conflict :-)"	defect	new	major		Core	tested			
