Replying to joshdoe:
A right click option with "Resolve using mine" and "Resolve using theirs" would be great, and parallels version control systems.
+100 -- to "Resolve using theirs"
As stoecker points having an (easy) option (available to anyone, I would add) would undermine what the whole conflict resolution aims at.
Having said that -- since there are enough many _and_ recurring real life cases where all of the server data should be over written I see a case for having such option for admins or some other "conflict resolution specialists".
I've only had a maximum of about a 1000 conflicts to click through at most so it seems that I can just feel the pain an frustration of others and thank that I haven't had more. .. But since my biggest conflict issues have been caused by f*ckers who've messed up (dirty revert stuff) and I've wasted a few evenings/nights with those I will re-iterate that I think that it would be _really_ good if the project had Someone or Some Group of people that could run over the db with a given data set.
So, two things:
1) I think there should be an option to give up all of one's conflicted edits in favor of the data on the server. .. There have been some cases where I haven't bothered to upload my edits at all because I haven't had the patience to run "their version" over mine (.. I currently have 136 cases left in my JOSM, will do that this time).
2) It would be just as good to have Someone (publicly appointed) who mappers could contact to persuade to run server data over with their data.
Thoughts?
