We read every piece of feedback, and take your input very seriously.
1 parent 2984a7c commit b4e2d5eCopy full SHA for b4e2d5e
options/locale/locale_en-US.ini
@@ -1951,6 +1951,7 @@ pulls.upstream_diverging_prompt_behind_1 = This branch is %[1]d commit behind %[
1951
pulls.upstream_diverging_prompt_behind_n = This branch is %[1]d commits behind %[2]s
1952
pulls.upstream_diverging_prompt_base_newer = The base branch %s has new changes
1953
pulls.upstream_diverging_merge = Sync fork
1954
+pulls.upstream_diverging_merge_confirm = Would you like to merge base repository's default branch onto this repository's branch %s?
1955
1956
pull.deleted_branch = (deleted):%s
1957
pull.agit_documentation = Review documentation about AGit
templates/repo/code/upstream_diverging_info.tmpl
@@ -10,7 +10,10 @@
10
{{end}}
11
</div>
12
{{if .CanWriteCode}}
13
- <button class="ui compact primary button tw-m-0 link-action" data-url="{{.Repository.Link}}/branches/merge-upstream?branch={{.BranchName}}">
+ <button class="ui compact primary button tw-m-0 link-action"
14
+ data-modal-confirm-header="{{ctx.Locale.Tr "repo.pulls.upstream_diverging_merge"}}"
15
+ data-modal-confirm-content="{{ctx.Locale.Tr "repo.pulls.upstream_diverging_merge_confirm" .BranchName}}"
16
+ data-url="{{.Repository.Link}}/branches/merge-upstream?branch={{.BranchName}}">
17
{{ctx.Locale.Tr "repo.pulls.upstream_diverging_merge"}}
18
</button>
19