conflict resolution cannot resolve multiple objects at once

[bilbo]

I once ended up with about 9000 conflicts - most of them were caused by someone deleting the primitive (node or way) on server. But when I tried to resolve the conflicts by forcing "not deleted" state for all such objects, I found out, that you can work only on one node at once - even if you select more nodes in the conflict panel and press "resolve", the dialog will ask only about one - so for resolving all the conflicts you need about 18000 clicks.

Some way for the conflict dialog to work with multiple nodes wouild be necessary. Current state where it can work on only one primitive at a time is unuseable.

[anonymous]

I'd like to second this, I had a similar problem except I had 19,000 conflicts, which were only fixable one at a time. They were all entirely down to a failed (and reverted) upload and not edits from anyone else. I have given up trying to upload the data, which is a shame. I simply can't face doing everything again, which is what it would take. I'm certainly not going to click on 'keep my version' 19,000 times. It's not the first time I've ended up with thousands of conflicts due to failed uploads.

This is massively frustrating, all I want is to be able to select all conflicts and click 'keep my version'! There must be some way to do this.

[joshdoe]

A right click option with "Resolve using mine" and "Resolve using theirs" would be great, and parallels version control systems.

[stoecker]

"all I want is to be able to select all conflicts and click 'keep my version'"

Exactly this is what we don't want. Essentially that means to ignore the work of others and overwrite their work. In this case the current form which prevents you (who comes later than the server changes) from uploading at all is better.

[skyper]

Please, group the conflict in a better way.

I you move a way (many nodes) and someone else meanwhile delete all created_by=JOSM, you will get a conflict for every node. It would be nice to have the nodes all listed together and if selected get a info that the conflicts are of the same kind (my=change position; their=same tag edits). Then it would be possible to use the solution once for some conflicts instead of just one after the other.

Objects which are deleted on either side would be also an interesting group, but be aware of #4654.

[jaakkoh]

Replying to joshdoe:

A right click option with "Resolve using mine" and "Resolve using theirs" would be great, and parallels version control systems.

+100

[naoliv]

Got "hit" by this too, with some 170 conflicts (510 clicks)

[Victor]

Same problem here, maybe enable mass resolving it only if there are more than 50 changes to avoid lazy overriding.

[Don-vip]

Ticket #18587 has been marked as a duplicate of this ticket.

[skyper]

This is already implemented. See Conflict List Dialog.