From 1299fdb0849cac862b00717070c27846075c2e85 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 15 Jan 2025 02:30:43 +0800 Subject: [PATCH] Add a confirm dialog for "sync fork" (#33270) Try to quickly fix #33264 --- options/locale/locale_en-US.ini | 1 + templates/repo/code/upstream_diverging_info.tmpl | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index d336b6a700..e5fab5911a 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1953,6 +1953,7 @@ pulls.upstream_diverging_prompt_behind_1 = This branch is %[1]d commit behind %[ pulls.upstream_diverging_prompt_behind_n = This branch is %[1]d commits behind %[2]s pulls.upstream_diverging_prompt_base_newer = The base branch %s has new changes pulls.upstream_diverging_merge = Sync fork +pulls.upstream_diverging_merge_confirm = Would you like to merge base repository's default branch onto this repository's branch %s? pull.deleted_branch = (deleted):%s pull.agit_documentation = Review documentation about AGit diff --git a/templates/repo/code/upstream_diverging_info.tmpl b/templates/repo/code/upstream_diverging_info.tmpl index bdcd99a7f7..a1f37b8c05 100644 --- a/templates/repo/code/upstream_diverging_info.tmpl +++ b/templates/repo/code/upstream_diverging_info.tmpl @@ -10,7 +10,10 @@ {{end}} {{if .CanWriteCode}} - {{end}}