rebase rework

frontend/src/lib/i18n/locales/en.json

@@ -295,6 +295,18 @@
       "ahead_remote": "Ahead Remote",
       "diverged": "Diverged",
       "error": "Error"
+    },
+    "unfinished_merge": {
+      "title": "Repository has an unfinished merge",
+      "default_message": "An unfinished merge was detected. Resolve conflicts or abort merge manually, then retry Pull.",
+      "repository_path": "Repository path",
+      "branch": "Current branch",
+      "next_steps": "Recommended steps",
+      "manual_commands": "Manual recovery commands",
+      "copy_commands": "Copy commands",
+      "copy_success": "Commands copied to clipboard",
+      "copy_failed": "Failed to copy commands",
+      "copy_empty": "No commands to copy"
     }
   },
   "dashboard": {