修复合并编辑时的代码问题

2026-03-14 21:25:41 +08:00
parent 2b679b5ba8
commit 0b820594d9
2 changed files with 3 additions and 6 deletions
--- a/src/components/layout/branch-dropdown.tsx
+++ b/src/components/layout/branch-dropdown.tsx
@@ -361,7 +361,6 @@ export function BranchDropdown({
        // Remote has new commits — auto-pull then retry push
        updateTask(taskId, {
          status: "running",
-          label: t("tasks.pullCode"),
        })
        try {
          const pullResult = await gitPull(folderPath)
@@ -371,7 +370,7 @@ export function BranchDropdown({
            setConflictInfo(pullResult.conflict)
          } else {
            // Pull succeeded, retry push
-            updateTask(taskId, { status: "running", label })
+            updateTask(taskId, { status: "running" })
            const pushResult = await gitPush(folderPath)
            updateTask(taskId, { status: "completed" })
            onBranchChange()