Changes between Version 1 and Version 3 of Ticket #5374
- Timestamp:
- 2011-09-29T13:24:11+02:00 (14 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Ticket #5374
- Property Priority minor → normal
- Property Summary Error at merging relation conflict → Error (NPE) at merging relation conflict
-
Ticket #5374 – Description
v1 v3 1 I had a conflict with a relation (I only edited it, maybe that is another bug, or that caused the bug). At the 'Resolve conflicts' dialog, at the tab members with conflicts, I selected compare: 'theirs with merged' and the clicked in the middle table (merged version). Then there came an error: 2 1 3 {{{ 2 4 Repository Root: http://josm.openstreetmap.de/svn … … 8 10 Last Changed Date: 2010-08-21 23:11:30 +0200 (Sat, 21 Aug 2010) 9 11 Last Changed Rev: 3456 10 11 I had a conflict with a relation (I only edited it, maybe that is another bug, or that caused the bug). At the 'Resolve conflicts' dialog, at the tab members with conflicts, I selected compare: 'theirs with merged' and the clicked in the middle table (merged version). Then there came an error.12 12 13 13 Identification: JOSM/1.5 (3456 nl)