conflict manager: highlight conflict on properties

[skyper]

Hi

Please also highlight a conflict on properties (red square) within the conflict manager, like it is done with the other 3 categories.

Thanks

[skyper]

Hey guys.

One and a have year past and I stumbled over this again. Took me about two hours to figure out.

So please.

r4114

[stoecker]

Do you have a test file, which causes a corresponding conflict when uploaded?

[skyper]

Replying to stoecker:

Do you have a test file, which causes a corresponding conflict when uploaded?

Thought you know how to create a conflict !

1. Just download the same node twice in different layers
2. move both.
3. merge both layers you get a conflict.

but anyway, here you go. Just merge the two files.

[skyper]

file one

[skyper]

file two

[stoecker]

Well, I tried and it works for me as expected.

[skyper]

Replying to stoecker:

Well, I tried and it works for me as expected.

You have a red box for tags but there is not red box for properties. Thus you focus on the conflict on tags and once switched to tags you do not get any information about the conflict in properties. (red box is missing)

[stoecker]

Yeah I see it. I looked at wrong place till now.

[stoecker]

In [4115/josm]:

fix #4564 - conflict manager: highlight conflict on properties

[skyper]

Now the red box stays there even without a conflict. Should it not vanish or change to a green ccheckmark ?

[stoecker]

In [4116/josm]:

fix #4564 - conflict manager: highlight conflict on properties