When I started remodeling my capital city, I isolated some components (the embassies, for example) and saved them as separate osm files so I could put them back once I found a spot for them in the ‘new’ city.
However, since the replacements are the same version number as the originals that were deleted, JOSM pitches a fit about data-set synchronization when I upload; the message “your version is version 1, server has version 2”. Conflict resolution is slow because I can’t get JOSM to download all the desynced data at once (I get a read timed out error if I try to synchronize the entire data-set, which I sometimes get on normal data downloads from the server), so I have to sync each each conflict individually.
Is there a faster way around this issue? I have more things I plan on restoring in this manner and would like the process to go a bit quicker. :)
-Reece