Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 17272)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 17273)
@@ -518,10 +518,20 @@
                         resolver.populate(c);
                         resolver.decideRemaining(type);
-                        commands.add(resolver.buildResolveCommand());
+                        Command cmd = resolver.buildResolveCommand();
+                        cmd.executeCommand(); // execute now, see #6529
+                        commands.add(cmd);
                     }
                 }
             }
-            UndoRedoHandler.getInstance().add(new SequenceCommand(name, commands));
+            UndoRedoHandler.getInstance().add(new ResolveConflictsCommand(name, commands), false);
             refreshView();
+        }
+    }
+
+    private static class ResolveConflictsCommand extends SequenceCommand {
+        // just  a wrapper for already executed commands
+        ResolveConflictsCommand(String name, Collection<Command> sequenz) {
+            super(name, sequenz, true);
+            setSequenceComplete(true);
         }
     }