File tree 2 files changed +5
-1
lines changed
2 files changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -1951,6 +1951,7 @@ pulls.upstream_diverging_prompt_behind_1 = This branch is %[1]d commit behind %[
1951
1951
pulls.upstream_diverging_prompt_behind_n = This branch is %[1]d commits behind %[2]s
1952
1952
pulls.upstream_diverging_prompt_base_newer = The base branch %s has new changes
1953
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?
1954
1955
1955
1956
pull.deleted_branch = (deleted):%s
1956
1957
pull.agit_documentation = Review documentation about AGit
Original file line number Diff line number Diff line change 10
10
{{end}}
11
11
</div>
12
12
{{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}}">
14
17
{{ctx.Locale.Tr "repo.pulls.upstream_diverging_merge"}}
15
18
</button>
16
19
{{end}}
You can’t perform that action at this time.
0 commit comments