Merge branch 'dev'

saqqdy · Aug 12, 2022 · abaafb2 · abaafb2
2 parents 3227a1b + 51d2134
commit abaafb2
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/packages/gitmars/src/gitm-admin.ts b/packages/gitmars/src/gitm-admin.ts
@@ -682,6 +682,7 @@ updateProgram.action(
         } else if (opt.mode === 2) {
             mode = ' --strategy-option theirs'
         }
+        fetch()
         if (opts.includes(type)) {
             // 是否需要合并
             const isNeedCombine = !getIsMergedTargetBranch(