This is a static archive of our old OpenStreetMap Help Site. Please post any new questions and answers at community.osm.org.

Resolving Conflicts in JOSM

1

Hi I have recently make some changes to an area of map which i have created on JOSM a few weeks back. I have make some changes to it and it result in conflicts with the previous version. How do i resolve it such that it shows only my updated one?

asked 09 Apr '11, 16:23

zyyzzy's gravatar image

zyyzzy
31334
accept rate: 0%

edited 06 Mar '14, 14:49

aseerel4c26's gravatar image

aseerel4c26 ♦
32.6k18248554

1

Be careful, to blindly use your version. The reason that there is a conflict is that another mapper changed the map that you downloaded a few weeks back. By taking your version, you undo whatever was done by the other mapper. If you made a small number of changed, I recommend that you start all over by first downloading the area from the server and make your changes on an up-to-date version of the data,

(06 Mar '14, 17:01) escada

One Answer:

1

Have a look in the OSM wiki at JOSM/Advanced_editing ... there are some hints for resolving conflicts.

answered 09 Apr '11, 19:10

stephan75's gravatar image

stephan75
12.6k556210
accept rate: 6%

Source code available on GitHub .