gitea/templates/repo/issue/view_content/pull_merge_instruction.tmpl

20 lines
1.1 KiB
Handlebars
Raw Normal View History

<div class="divider"></div>
2023-09-24 22:31:58 +02:00
<div class="instruct-toggle"> {{ctx.Locale.Tr "repo.pulls.merge_instruction_hint" | Safe}} </div>
<div class="instruct-content gt-mt-3 gt-hidden">
2023-09-24 22:31:58 +02:00
<div><h3 class="gt-dib">{{ctx.Locale.Tr "step1"}}</h3> {{ctx.Locale.Tr "repo.pulls.merge_instruction_step1_desc"}}</div>
<div class="ui secondary segment">
2023-09-24 22:31:58 +02:00
{{if eq .Flow 0}}
<div>git checkout -b {{if ne .HeadRepo.ID .BaseRepo.ID}}{{.HeadRepo.OwnerName}}-{{end}}{{.HeadBranch}} {{.BaseBranch}}</div>
<div>git pull {{if ne .HeadRepo.ID .BaseRepo.ID}}<gitea-origin-url data-url="{{.HeadRepo.Link}}"></gitea-origin-url>{{else}}origin{{end}} {{.HeadBranch}}</div>
{{else}}
2023-09-24 22:31:58 +02:00
<div>git fetch origin {{.GetGitRefName}}:{{.HeadBranch}}</div>
{{end}}
</div>
2023-09-24 22:31:58 +02:00
<div><h3 class="gt-dib">{{ctx.Locale.Tr "step2"}}</h3> {{ctx.Locale.Tr "repo.pulls.merge_instruction_step2_desc"}}</div>
<div class="ui secondary segment">
2023-09-24 22:31:58 +02:00
<div>git checkout {{.BaseBranch}}</div>
<div>git merge --no-ff {{if ne .HeadRepo.ID .BaseRepo.ID}}{{.HeadRepo.OwnerName}}-{{end}}{{.HeadBranch}}</div>
<div>git push origin {{.BaseBranch}}</div>
</div>
</div>