id	summary	reporter	owner	description	type	status	priority	milestone	component	version	resolution	keywords	cc
9403	[Patch] Relation members sorting in conflict editor	josm@…	team	"Relation conflict editor could list all the relations in some defined order, so only changes in membership will be affected. This would help a lot in resolving conflicts

Proposed simple patch:
{{{
Index: src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java
===================================================================
--- src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java	(revision 6453)
+++ src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java	(working copy)
@@ -3,6 +3,8 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 
@@ -67,12 +69,24 @@
     public void populate(Relation my, Relation their, Map<PrimitiveId, PrimitiveId> mergedMap) {
         initPopulate(my, their, mergedMap);
 
+        final Comparator<RelationMember> relationMemberComparator = new Comparator<RelationMember>() {
+            @Override
+            public int compare(RelationMember o1, RelationMember o2) {
+                return Long.compare(o1.getUniqueId(), o2.getUniqueId());
+            }
+
+        };
+
         for (RelationMember n : my.getMembers()) {
             getMyEntries().add(n);
         }
+        Collections.sort(getMyEntries(), relationMemberComparator);
+
         for (RelationMember n : their.getMembers()) {
             getTheirEntries().add(n);
         }
+        Collections.sort(getTheirEntries(), relationMemberComparator);
+
         if (myAndTheirEntriesEqual()) {
             for (RelationMember m : getMyEntries()) {
                 getMergedEntries().add(cloneEntryForMergedList(m));

}}}"	enhancement	closed	normal		Core	tested	wontfix	conflict,relation