File tree Expand file tree Collapse file tree 2 files changed +5
-1
lines changed Expand file tree Collapse file tree 2 files changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -1953,6 +1953,7 @@ pulls.upstream_diverging_prompt_behind_1 = This branch is %[1]d commit behind %[
19531953pulls.upstream_diverging_prompt_behind_n = This branch is %[1]d commits behind %[2]s
19541954pulls.upstream_diverging_prompt_base_newer = The base branch %s has new changes
19551955pulls.upstream_diverging_merge = Sync fork
1956+ pulls.upstream_diverging_merge_confirm = Would you like to merge base repository' s default branch onto this repository' s branch %s?
19561957
19571958pull.deleted_branch = (deleted):%s
19581959pull.agit_documentation = Review documentation about AGit
Original file line number Diff line number Diff line change 1010 {{end}}
1111 </div>
1212 {{if .CanWriteCode}}
13- <button class="ui compact primary button tw-m-0 link-action" data-url="{{.Repository.Link}}/branches/merge-upstream?branch={{.BranchName}}">
13+ <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}}">
1417 {{ctx.Locale.Tr "repo.pulls.upstream_diverging_merge"}}
1518 </button>
1619 {{end}}
You can’t perform that action at this time.
0 commit comments