支持git冲突时弹出窗口合并代码解决冲突

2026-03-14 20:55:15 +08:00
parent f503c25161
commit 4129f02985
25 changed files with 3123 additions and 51 deletions
--- a/src-tauri/capabilities/default.json
+++ b/src-tauri/capabilities/default.json
@@ -2,7 +2,7 @@
  "$schema": "../gen/schemas/desktop-schema.json",
  "identifier": "default",
  "description": "Capability for the main window",
-  "windows": ["welcome", "folder-*", "commit-*", "settings"],
+  "windows": ["welcome", "folder-*", "commit-*", "merge-*", "settings"],
  "permissions": [
    "core:default",
    "core:window:default",