﻿id	summary	reporter	owner	description	type	status	priority	milestone	component	version	resolution	keywords	cc
24400	Can't resolve conflicts to their version	anonymous	team	"==== What steps will reproduce the problem?
1. selecting all conflicts and resolving them to their version
2. 
3. 

==== What is the expected result?
resolves the conflicts
==== What happens instead?
shows up the bug menu
==== Please provide any additional information below. Attach a screenshot if possible.

{{{
Revision:19412
Build-Date:2025-06-03 14:12:44

Identification: JOSM/1.5 (19412 en) Windows 11 64-Bit
OS Build number: Windows 10 Home 22H2 (22621)
Memory Usage: 3824 MB / 11808 MB (2529 MB allocated, but free)
Java version: 21.0.7+6-LTS, Azul Systems, Inc., OpenJDK 64-Bit Server VM
Look and Feel: com.sun.java.swing.plaf.windows.WindowsLookAndFeel
Screen: \Display0 3440x1440x32bpp@50Hz (scaling 1.00×1.00)
Maximum Screen Size: 3440×1440
Best cursor sizes: 16×16→32×32, 32×32→32×32
System property file.encoding: UTF-8
System property sun.jnu.encoding: Cp1252
Locale info: en_US
Numbers with default locale: 1234567890 -> 1234567890
VM arguments: [-Djpackage.app-version=1.5.19412, -XX:MaxRAMPercentage=75.0, --add-modules=java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web, --add-exports=java.base/sun.security.action=ALL-UNNAMED, --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED, --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED, --add-opens=java.base/java.lang=ALL-UNNAMED, --add-opens=java.base/java.nio=ALL-UNNAMED, --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED, --add-opens=java.base/jdk.internal.ref=ALL-UNNAMED, --add-opens=java.desktop/javax.imageio.spi=ALL-UNNAMED, --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED, --add-opens=java.prefs/java.util.prefs=ALL-UNNAMED, -Djpackage.app-path=%UserProfile%\AppData\Local\JOSM\JOSM.exe]
Dataset consistency test: No problems found

Plugins:
+ CustomizePublicTransportStop (36438)
+ FastDraw (36438)
+ HouseNumberTaggingTool (36438)
+ PicLayer (266)
+ PolygonCutOut (v0.7.3)
+ Review.Changes (1.1.1)
+ apache-commons (36438)
+ buildings_tools (36438)
+ fastdriveway (v1.0.1)
+ flatlaf (36415)
+ gridify (1743579163)
+ josm_magic_wand (3.0.0)
+ jts (36438)
+ mapwithai (839)
+ measurement (36438)
+ pdfimport (36438)
+ pmtiles (36438)
+ splinex (36438)
+ undelete (36438)
+ utilsplugin2 (36438)

Tagging presets:
+ https://github.com/kendzi/Simple3dBuildingsPreset/releases/download/0.9_2018-05-08/s3db-preset.zip
+ https://josm.openstreetmap.de/josmfile?page=Presets/BuildingPreset&zip=1
+ https://josm.openstreetmap.de/josmfile?page=Presets/Historic_Stone&zip=1
+ https://josm.openstreetmap.de/josmfile?page=Presets/DamageTagging&zip=1
+ https://josm.openstreetmap.de/josmfile?page=Presets/FitnessStationEquipment&zip=1
+ https://josm.openstreetmap.de/josmfile?page=Presets/MappingAccessibility&zip=1
+ https://josm.openstreetmap.de/josmfile?page=Presets/Mountains&zip=1
+ https://josm.openstreetmap.de/josmfile?page=Presets/PostPartner&zip=1
+ https://www.yamasita.jp/osm/seminar/OSM_MappingParty/ShrinesAndTemples.xml
+ https://josm.openstreetmap.de/josmfile?page=Presets/SkiingTrail&zip=1
+ https://raw.githubusercontent.com/yopaseopor/traffic_signs_preset_JOSM/master/TR.zip

Map paint styles:
+ https://josm.openstreetmap.de/josmfile?page=Styles/MapWithAI&zip=1
+ https://josm.openstreetmap.de/josmfile?page=Styles/BuildingColors&zip=1
- https://josm.openstreetmap.de/josmfile?page=Styles/NewHighwayColors&zip=1
- https://josm.openstreetmap.de/josmfile?page=Styles/iD&zip=1
- https://josm.openstreetmap.de/josmfile?page=Styles/Waterways&zip=1
- https://github.com/bastik/mapcss-tools/raw/osm/mapnik2mapcss/osm-results/mapnik.zip
- https://josm.openstreetmap.de/josmfile?page=Styles/Potlatch2&zip=1
+ https://josm.openstreetmap.de/josmfile?page=Styles/Potlach2_access&zip=1
- https://josm.openstreetmap.de/josmfile?page=Styles/Enhanced_Lane_and_Road_Attributes&zip=1
+ https://josm.openstreetmap.de/josmfile?page=Styles/Lane_and_Road_Attributes&zip=1

Last errors/warnings:
- 885593.357 E: org.openstreetmap.josm.plugins.PluginDownloadException: java.nio.file.FileSystemException: <josm.pref>\plugins\flatlaf.jar.new: The process cannot access the file because it is being used by another process. Cause: java.nio.file.FileSystemException: <josm.pref>\plugins\flatlaf.jar.new: The process cannot access the file because it is being used by another process
- 885594.654 W: Update plugins - <html>The following plugin has been downloaded <strong>successfully</strong>:<ul><li>gridify (1743579163)</li></ul>Downloading the following plugin has <strong>failed</strong>:<ul><li>flatlaf</li></ul><br>Error message(untranslated): java.nio.file.FileSystemException: <josm.pref>\plugins\flatlaf.jar.new: The process cannot access the file because it is being used by another process</html>
- 970867.506 E: Error header: Version mismatch: Provided 20, server had: 22 of Relation 470261
- 970868.734 E: Conflicts detected - <html>Uploading <strong>failed</strong> because the server has a newer version of one<br>of your nodes, ways, or relations.<br>The conflict is caused by the <strong>relation</strong> with id <strong>470 261</strong>,<br>the server has version 22, your version is 20.<br><br>Click <strong>Synchronize relation 470 261 only</strong> to synchronize the conflicting primitive only.<br>Click <strong>Synchronize entire dataset</strong> to synchronize the entire local dataset with the server.<br>Click <strong>Cancel</strong> to abort and continue editing.<br></html>
- 970879.149 W: Conflicts detected - <html>There were 5 conflicts detected.</html>
- 970991.264 W: Warning - <html>The data to be uploaded participates in unresolved conflicts of layer '14e3.osm'.<br>You have to resolve them first.</html>
- 971033.158 W: Warning - <html>The data to be uploaded participates in unresolved conflicts of layer '14e3.osm'.<br>You have to resolve them first.</html>
- 971138.964 W: Warning - <html>The data to be uploaded participates in unresolved conflicts of layer '14e3.osm'.<br>You have to resolve them first.</html>
- 971152.047 W: Warning - <html>The data to be uploaded participates in unresolved conflicts of layer '14e3.osm'.<br>You have to resolve them first.</html>
- 971202.651 E: Handled by bug report queue: java.lang.IllegalArgumentException: Parameter 'data' must not be null

OSM API: https://opengeofiction.net/api


=== REPORTED CRASH DATA ===
BugReportExceptionHandler#handleException:
No data collected.

Warning issued by: BugReportExceptionHandler#handleException

=== STACK TRACE ===
Thread: AWT-EventQueue-0 (40) of main
java.lang.IllegalArgumentException: Parameter 'data' must not be null
	at org.openstreetmap.josm.tools.CheckParameterUtil.ensureParameterNotNull(CheckParameterUtil.java:26)
	at org.openstreetmap.josm.command.Command.<init>(Command.java:138)
	at org.openstreetmap.josm.command.conflict.ConflictResolveCommand.<init>(ConflictResolveCommand.java:32)
	at org.openstreetmap.josm.command.conflict.VersionConflictResolveCommand.<init>(VersionConflictResolveCommand.java:31)
	at org.openstreetmap.josm.gui.conflict.pair.ConflictResolver.buildResolveCommand(ConflictResolver.java:298)
	at org.openstreetmap.josm.gui.dialogs.ConflictDialog$ResolveToAction.actionPerformed(ConflictDialog.java:535)
	at java.desktop/javax.swing.AbstractButton.fireActionPerformed(Unknown Source)
	at java.desktop/javax.swing.AbstractButton$Handler.actionPerformed(Unknown Source)
	at java.desktop/javax.swing.DefaultButtonModel.fireActionPerformed(Unknown Source)
	at java.desktop/javax.swing.DefaultButtonModel.setPressed(Unknown Source)
	at java.desktop/javax.swing.AbstractButton.doClick(Unknown Source)
	at java.desktop/javax.swing.plaf.basic.BasicMenuItemUI.doClick(Unknown Source)
	at java.desktop/javax.swing.plaf.basic.BasicMenuItemUI$Handler.mouseReleased(Unknown Source)
	at java.desktop/java.awt.AWTEventMulticaster.mouseReleased(Unknown Source)
	at java.desktop/java.awt.Component.processMouseEvent(Unknown Source)
	at java.desktop/javax.swing.JComponent.processMouseEvent(Unknown Source)
	at java.desktop/java.awt.Component.processEvent(Unknown Source)
	at java.desktop/java.awt.Container.processEvent(Unknown Source)
	at java.desktop/java.awt.Component.dispatchEventImpl(Unknown Source)
	at java.desktop/java.awt.Container.dispatchEventImpl(Unknown Source)
	at java.desktop/java.awt.Component.dispatchEvent(Unknown Source)
	at java.desktop/java.awt.LightweightDispatcher.retargetMouseEvent(Unknown Source)
	at java.desktop/java.awt.LightweightDispatcher.processMouseEvent(Unknown Source)
	at java.desktop/java.awt.LightweightDispatcher.dispatchEvent(Unknown Source)
	at java.desktop/java.awt.Container.dispatchEventImpl(Unknown Source)
	at java.desktop/java.awt.Window.dispatchEventImpl(Unknown Source)
	at java.desktop/java.awt.Component.dispatchEvent(Unknown Source)
	at java.desktop/java.awt.EventQueue.dispatchEventImpl(Unknown Source)
	at java.desktop/java.awt.EventQueue$4.run(Unknown Source)
	at java.desktop/java.awt.EventQueue$4.run(Unknown Source)
	at java.base/java.security.AccessController.doPrivileged(Unknown Source)
	at java.base/java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(Unknown Source)
	at java.base/java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(Unknown Source)
	at java.desktop/java.awt.EventQueue$5.run(Unknown Source)
	at java.desktop/java.awt.EventQueue$5.run(Unknown Source)
	at java.base/java.security.AccessController.doPrivileged(Unknown Source)
	at java.base/java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(Unknown Source)
	at java.desktop/java.awt.EventQueue.dispatchEvent(Unknown Source)
	at java.desktop/java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source)
	at java.desktop/java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source)
	at java.desktop/java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source)
	at java.desktop/java.awt.EventDispatchThread.pumpEvents(Unknown Source)
	at java.desktop/java.awt.EventDispatchThread.pumpEvents(Unknown Source)
	at java.desktop/java.awt.EventDispatchThread.run(Unknown Source)
}}}
"	defect	closed	normal		Core		needinfo	template_report	
