id summary reporter owner description type status priority milestone component version resolution keywords cc 15936 Conflict resolution won't allow me to apply a resolution if differing tags is the primary issue chris@… team "==== What steps will reproduce the problem? 1. Submit a changeset with conflicting tags 2. Open the conflict resolution dialogue (and hope it doesn't freeze on you) 3. Select the correct tags and click that arrow to send it to the middle 4. The apply resolution button is still greyed out ==== What is the expected result? I'm allowed to apply the resolution ==== What happens instead? The ""apply resolution"" button is unresponsive ==== Please provide any additional information below. Attach a screenshot if possible. It's probably some Java on the Mac bug. {{{ URL:http://josm.openstreetmap.de/svn/trunk Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b Last:Changed Date: 2018-01-28 23:08:56 +0100 (Sun, 28 Jan 2018) Build-Date:2018-01-28 22:25:44 Revision:13367 Relative:URL: ^/trunk Identification: JOSM/1.5 (13367 en) Mac OS X 10.11.6 OS Build number: Mac OS X 10.11.6 (15G19009) Memory Usage: 836 MB / 1820 MB (512 MB allocated, but free) Java version: 1.8.0_161-b12, Oracle Corporation, Java HotSpot(TM) 64-Bit Server VM Screen: Display 2026427093 1920x1080 Maximum Screen Size: 1920x1080 VM arguments: [-Djava.security.policy=file:/lib/security/javaws.policy, -DtrustProxy=true, -Djnlpx.home=/bin, -Djava.security.manager, -Djnlpx.origFilenameArg=${HOME}/Library/Application Support/Oracle/Java/Deployment/cache/6.0/56/1ee8cfb8-668392a0, -Djnlpx.remove=false, -Dsun.awt.warmup=true, -Djava.util.Arrays.useLegacyMergeSort=true, -Dmacosx.jnlpx.dock.name=JOSM, -Dmacosx.jnlpx.dock.icon=${HOME}/Library/Application Support/Oracle/Java/Deployment/cache/6.0/16/47ee53d0-5050928a.icns, -Djnlp.application.href=https://josm.openstreetmap.de/download/josm.jnlp , -Djnlpx.jvm=""/bin/java""] Dataset consistency test: No problems found Last errors/warnings: - W: Conflicts detected - There was 1 conflict detected. - E: Error header: Version mismatch: Provided 1, server had: 2 of Node 3311151381 - E: Conflicts detected - Uploading failed because the server has a newer version of one
of your nodes, ways, or relations.
The conflict is caused by the node with id 3,311,151,381,
the server has version 2, your version is 1.

Click Synchronize node 3,311,151,381 only to synchronize the conflicting primitive only.
Click Synchronize entire dataset to synchronize the entire local dataset with the server.
Click Cancel to abort and continue editing.
- W: Conflicts detected - There was 1 conflict detected. - E: Error header: Version mismatch: Provided 1, server had: 2 of Node 3311151382 - E: Conflicts detected - Uploading failed because the server has a newer version of one
of your nodes, ways, or relations.
The conflict is caused by the node with id 3,311,151,382,
the server has version 2, your version is 1.

Click Synchronize node 3,311,151,382 only to synchronize the conflicting primitive only.
Click Synchronize entire dataset to synchronize the entire local dataset with the server.
Click Cancel to abort and continue editing.
- W: Conflicts detected - There were 2 conflicts detected. - W: Conflicts detected - There were 2 conflicts detected. - W: Conflicts detected - There were 49 conflicts detected. - W: Deleted or moved objects - There are 110 objects in your local dataset which might be deleted on the server.
If you later try to delete or update them the server is likely to report a conflict.
Click Check on the server to check the state of these objects on the server.
Click Ignore to ignore. }}} " defect closed major Core worksforme template_report