No conflict resolution after detection of conflicts at uploading when using overpass as data source

[Squizie3]

What steps will reproduce the problem?

1. Download some data through overpass as usual (using out meta, etc.): it can be either with the built in 'Download from Overpass API', or trough Overpass Turbo's 'load data into an OSM editor: JOSM' or even Overpass Turbo's 'export as raw OSM data' (and then opening the .osm file).
2. Make an edit on the data in JOSM (make sure you're not downloading extra data using the 'Download in current view' option).
3. Make an edit on the same node, way or relation outside JOSM (for example using the ID-editor) and have it uploaded to the openstreetmap server, thus in essence creating an editing conflict.
4. Try to upload your JOSM-edited data to the openstreetmap server.

What is the expected result?

A pop-up warning that conflicts have been detected while uploading, asking you to synchronize the data first. Then actually synchronizing the data. After this another pop-up warning should come up saying the amount of conflicts detected, and those conflicts should appear in the conflict pane.

What happens instead?

A pop-up warning that conflicts have been detected while uploading is indeed shown, asking you to synchronize the data first. Then it appears it is synchronizing the data, but I'm not sure if it really does. But the main problem is that after this there won't come a pop-up warning saying the amount of conflicts detected, and no conflicts will appear in the conflict pane. So you can't resolve the conflicts, and trying to upload again results in the same procedure to happen so you're essentially stuck with data you can't fix and can't upload.

Please provide any additional information below. Attach a screenshot if possible.

A possible explanation I can think of is that conflicts are only detected if it is within the bbox outlining the downloaded area of data downloaded through the 'Download in current view' option. But when editing data downloaded through overpass or possibly also other sources, there is no bbox outlining the download area shown in JOSM. In this case, conflicts aren't resolvable when you try to upload as the server only gives a bad response but no solutions to fix this are offered. The only workaround is to still perform an extra download using 'Download in current view' on the area containing the conflict. The latter behaves as expected and shows all conflicts, so you can circumvent the problem somehow, but it requires you to find the area the conflict is located in and then performing extra downloads through that download option. This can be really tedious if your overpass dataset is quite large or multiple conflicts are present. In case of multiple conflicts the server will only report one conflicting node per time you try to upload, and after that you first have to find that area and download it before proceeding to the next try, and so on. In that case this workaround becomes even more tedious.

In essence, if my analysis is right it's necessary to detect and thus being able to resolve conflicts on all data in JOSM, not only the data in the downloaded area bbox. I'm not entirely sure this is the exact problem causing this behaviour as it could be otherwise too, but it's my best bet.

URL:https://josm.openstreetmap.de/svn/trunk
Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Last:Changed Date: 2019-06-03 00:05:30 +0200 (Mon, 03 Jun 2019)
Build-Date:2019-06-02 22:10:24
Revision:15155
Relative:URL: ^/trunk

Identification: JOSM/1.5 (15155 nl) Windows 10 64-Bit
OS Build number: Windows 10 Home 1803 (17134)
Memory Usage: 907 MB / 1820 MB (425 MB allocated, but free)
Java version: 1.8.0_201-b09, Oracle Corporation, Java HotSpot(TM) 64-Bit Server VM
Screen: \Display0 1366x768
Maximum Screen Size: 1366x768
VM arguments: [-Djava.security.manager, -Djava.security.policy=file:<java.home>\lib\security\javaws.policy, -DtrustProxy=true, -Djnlpx.home=<java.home>\bin, -Djnlpx.origFilenameArg=%UserProfile%\AppData\LocalLow\Sun\Java\Deployment\cache\6.0\56\1ee8cfb8-14761eb0, -Djnlpx.remove=false, -Djava.util.Arrays.useLegacyMergeSort=true, -Djnlpx.heapsize=NULL,2048m, -Djnlpx.splashport=21753, -Djnlp.application.href=https://josm.openstreetmap.de/download/josm.jnlp, -Djnlpx.jvm=<java.home>\bin\javaw.exe]
Dataset consistency test: No problems found

Plugins:
+ FastDraw (34977)
+ PicLayer (34908)
+ log4j (34908)
+ measurement (34977)
+ pbf (34908)
+ public_transport (34977)
+ reverter (34999)
+ routing (${version.entry.commit.revision})
+ splinex (34908)
+ utilsplugin2 (34977)

Map paint styles:
- https://josm.openstreetmap.de/josmfile?page=Styles/PublicTransportV2&zip=1

Last errors/warnings:
- E: Conflicten gedetecteerd - <html>Uploaden <strong>mislukt</strong> omdat de server een nieuwere versie van een <br>van uw knopen, wegen, of relaties heeft gevonden.<br>Het conflict is veroorzaakt door de <strong>knoop</strong> met id <strong>6.466.993.964</strong>,<br>de server heeft versie 3, uw versie is 2.<br><br>Klik op <strong>Synchroniseer alleen knoop 6.466.993.964</strong> om alleen het foutieve item te synchroniseren.<br>Klik op <strong>Synchroniseer de gehele gegevensset</strong> om de volledige gegevensset met de server te synchroniseren.<br>Klik op <strong>Annuleren</strong> om af te breken en verder te gaan met bewerken.<br></html>
- E: Error header: Version mismatch: Provided 2, server had: 3 of Node 6466993964
- E: Conflicten gedetecteerd - <html>Uploaden <strong>mislukt</strong> omdat de server een nieuwere versie van een <br>van uw knopen, wegen, of relaties heeft gevonden.<br>Het conflict is veroorzaakt door de <strong>knoop</strong> met id <strong>6.466.993.964</strong>,<br>de server heeft versie 3, uw versie is 2.<br><br>Klik op <strong>Synchroniseer alleen knoop 6.466.993.964</strong> om alleen het foutieve item te synchroniseren.<br>Klik op <strong>Synchroniseer de gehele gegevensset</strong> om de volledige gegevensset met de server te synchroniseren.<br>Klik op <strong>Annuleren</strong> om af te breken en verder te gaan met bewerken.<br></html>
- E: Error header: Version mismatch: Provided 1, server had: 2 of Node 6467595017
- E: Conflicten gedetecteerd - <html>Uploaden <strong>mislukt</strong> omdat de server een nieuwere versie van een <br>van uw knopen, wegen, of relaties heeft gevonden.<br>Het conflict is veroorzaakt door de <strong>knoop</strong> met id <strong>6.467.595.017</strong>,<br>de server heeft versie 2, uw versie is 1.<br><br>Klik op <strong>Synchroniseer alleen knoop 6.467.595.017</strong> om alleen het foutieve item te synchroniseren.<br>Klik op <strong>Synchroniseer de gehele gegevensset</strong> om de volledige gegevensset met de server te synchroniseren.<br>Klik op <strong>Annuleren</strong> om af te breken en verder te gaan met bewerken.<br></html>
- E: Error header: Version mismatch: Provided 3, server had: 4 of Node 6466993964
- E: Conflicten gedetecteerd - <html>Uploaden <strong>mislukt</strong> omdat de server een nieuwere versie van een <br>van uw knopen, wegen, of relaties heeft gevonden.<br>Het conflict is veroorzaakt door de <strong>knoop</strong> met id <strong>6.466.993.964</strong>,<br>de server heeft versie 4, uw versie is 3.<br><br>Klik op <strong>Synchroniseer alleen knoop 6.466.993.964</strong> om alleen het foutieve item te synchroniseren.<br>Klik op <strong>Synchroniseer de gehele gegevensset</strong> om de volledige gegevensset met de server te synchroniseren.<br>Klik op <strong>Annuleren</strong> om af te breken en verder te gaan met bewerken.<br></html>
- E: Error header: Version mismatch: Provided 3, server had: 4 of Node 6466993964
- E: Conflicten gedetecteerd - <html>Uploaden <strong>mislukt</strong> omdat de server een nieuwere versie van een <br>van uw knopen, wegen, of relaties heeft gevonden.<br>Het conflict is veroorzaakt door de <strong>knoop</strong> met id <strong>6.466.993.964</strong>,<br>de server heeft versie 4, uw versie is 3.<br><br>Klik op <strong>Synchroniseer alleen knoop 6.466.993.964</strong> om alleen het foutieve item te synchroniseren.<br>Klik op <strong>Synchroniseer de gehele gegevensset</strong> om de volledige gegevensset met de server te synchroniseren.<br>Klik op <strong>Annuleren</strong> om af te breken en verder te gaan met bewerken.<br></html>

[skyper]

Did you try it lately? There were some improvements made.
What was/is your setting for downloading objects? Is the checkbox in Preferences -> Connection settings -> Overpass server to use Overpass to download objects check?