Opened 15 years ago

Last modified 4 years ago

#6128 closed defect

Resolving node conflicts as "deleted" is broken — at Initial Version

Reported by: bilbo Owned by: team
Priority: major Milestone:
Component: Core Version: tested
Keywords: Cc:

Description

I encountered a conflict - I deleted some nodes that were referenced by a way outside of download region. When uploading I got conflict (my version was deleted, their was not deleted). I resoved conflict for all nodes to be "deleted" (so these nodes got deleted also from the other way that I previously have not known of) - however, the way (which now have the conflicting nodes removed) was not marked for upload, so after solving all the conflicts, I got them again.

When marking node as "deleted" in conflict, it must be removed from all known ways also.

Change History (0)

Note: See TracTickets for help on using tickets.