Apply suggestions from code review

Co-authored-by: Copilot <[email protected]>
Signed-off-by: kahirokunn <[email protected]>

Author: kahirokunn

frontend/src/components/common/Resource/EditorDialog.tsx

@@ -810,7 +810,9 @@ function EditorDialogInner(props: EditorDialogInnerProps) {
 
     // Arrays (including when only one side is an array) are treated as atomic values.
     // This intentionally handles array/non-array type mismatches as full replacements
-    // instead of attempting element-wise merges.
+    // instead of attempting element-wise merges. As a consequence, if both sides modify
+    // the same array, the merge logic will surface this as a single conflict that always
+    // requires manual resolution rather than attempting to auto-merge individual elements.
     if (Array.isArray(base) || Array.isArray(local)) {
       return [{ type: 'set', path, baseValue: base, value: local }];
     }
@@ -872,6 +874,9 @@ function EditorDialogInner(props: EditorDialogInnerProps) {
 
     // Ensure root is a container we can assign into.
     if (root === null || typeof root !== 'object') {
+      // We intentionally normalize the incoming root into an object/array here so that the
+      // rest of this helper can perform in-place updates efficiently. Callers must always
+      // use the returned root value, so this reassignment does not leak outside the function.
       // eslint-disable-next-line no-param-reassign
       root = typeof path[0] === 'number' ? [] : {};
     }

frontend/src/i18n/locales/de/translation.json

@@ -294,7 +294,7 @@
   "Reload from server": "",
   "Automatic merge failed due to conflicts. Please resolve manually.": "",
   "Merge my changes": "",
-  "This resource was updated on the server while you were editing.": "",
+  "This resource was updated on the server while you were editing.": "Diese Ressource wurde auf dem Server aktualisiert, während Sie sie bearbeitet haben.",
   "Editor": "Editor",
   "Documentation": "Dokumentation",
   "Undo": "Rückgängig machen",

frontend/src/i18n/locales/ta/translation.json

@@ -294,7 +294,7 @@
   "Reload from server": "",
   "Automatic merge failed due to conflicts. Please resolve manually.": "",
   "Merge my changes": "",
-  "This resource was updated on the server while you were editing.": "",
+  "This resource was updated on the server while you were editing.": "இந்த ரிசோர்ஸ் நீங்கள் திருத்திக் கொண்டிருக்கும் போது சர்வரில் புதுப்பிக்கப்பட்டது.",
   "Editor": "எடிட்டர்",
   "Documentation": "ஆவணப்படுத்தல்",
   "Undo": "செயல்தவிர்",

frontend/src/i18n/locales/zh-tw/translation.json

@@ -272,7 +272,7 @@
   "Edit": "編輯",
   "Loading resource": "讀取資源",
   "Error getting resource {{ resourceName }}: {{ errorMessage }}": "取得資源 {{ resourceName }} 時出錯：{{ errorMessage }}",
-  "Automatic merge is only supported for a single YAML/JSON document.": "",
+  "Automatic merge is only supported for a single YAML/JSON document.": "自動合併僅支援單一 YAML/JSON 文件。",
   "Invalid JSON": "無效的 JSON",
   "Invalid YAML": "無效的 YAML",
   "Failed to create {{ kind }} {{ name }}.": "新增 {{ kind }} {{ name }} 失敗。",