Handle multiple conflict revisions deterministically

2026-07-25 05:53:00 +00:00 · 2026-07-23 06:38:16 +00:00
parent d784799969
commit f8f11f358a
15 changed files with 576 additions and 97 deletions
@@ -17,8 +17,16 @@
    min-width: 5em;
 }

+.conflict-action-container {
+    display: flex;
+    flex-direction: column;
+    gap: var(--size-4-2);
+    margin-top: var(--size-4-2);
+}
+
 .conflict-action-button {
-    margin-right: 4px;
+    width: 100%;
+    margin: 0;
 }

 .op-scrollable {