there are several problems with conflict detection and conflict resolution in JOSM.
Here's a patch for one special case https://josm.openstreetmap.de/ticket/2507 which is yet to be applied to the source tree. If the server version and the client version differ in the value of map feature and and if the user decides to keep his version conflict resolution doesn't work either. I'm currently working on this one. I also came across the case you're describing here. Sometimes JOSM detects a conflict although the conflict resolution dialog is basically empty. Don't know yet how to reproduce it - do you? Karl -----Ursprüngliche Nachricht----- Von: [email protected] [mailto:[email protected]] Im Auftrag von Rolf Bode-Meyer Gesendet: Samstag, 2. Mai 2009 17:25 An: josm-dev Betreff: [josm-dev] Conflict resolution doesn't work Is the conflict resolution in JOSM supposed to work? Or may I do something wrong? On updating the data in an edited area I'm told there where conflicts and I get a relation listed in the Conflict panel. On clicking resolve a dialogue pops up but it doesn't show data in either of the three lists. Clicking resolve closes the dialogue, the entry in the panel is removed but on updating the data or uploading I get the error again. So what is it supposed to do, or is it not finished yet? Rolf _______________________________________________ josm-dev mailing list [email protected] http://lists.openstreetmap.org/listinfo/josm-dev _______________________________________________ josm-dev mailing list [email protected] http://lists.openstreetmap.org/listinfo/josm-dev
