2023-02-15 18:31:35 +03:00
<div class="ui divider"></div>
<div class="instruct-toggle"> {{ $ .locale .Tr "repo.pulls.merge_instruction_hint" | Safe }} </div>
<div class="instruct-content gt-mt-3" style="display:none">
2023-02-13 20:59:59 +03:00
<div><h3 class="gt-di"> {{ $ .locale .Tr "step1" }} </h3> {{ $ .locale .Tr "repo.pulls.merge_instruction_step1_desc" }} </div>
2022-06-11 17:44:20 +03:00
<div class="ui secondary segment">
{{ if eq $ .Issue .PullRequest .Flow 0 }}
<div>git checkout -b {{ if ne $ .Issue .PullRequest .HeadRepo .ID $ .Issue .PullRequest .BaseRepo .ID }} {{ $ .Issue .PullRequest .HeadRepo .OwnerName }} - {{ end }} {{ $ .Issue .PullRequest .HeadBranch }} {{ $ .Issue .PullRequest .BaseBranch }} </div>
2023-02-09 19:31:30 +03:00
{{ / * the only legacy HTMLURL used in template , which doesn ' t affect users too much and is very diffcult to fix , it should be fixed together with other AppUrl usages * / }}
2022-06-11 17:44:20 +03:00
<div>git pull {{ if ne $ .Issue .PullRequest .HeadRepo .ID $ .Issue .PullRequest .BaseRepo .ID }} {{ $ .Issue .PullRequest .HeadRepo .HTMLURL }} {{ else }} origin {{ end }} {{ $ .Issue .PullRequest .HeadBranch }} </div>
{{ else }}
<div>git fetch origin {{ $ .Issue .PullRequest .GetGitRefName }} : {{ $ .Issue .PullRequest .HeadBranch }} </div>
{{ end }}
</div>
2023-02-13 20:59:59 +03:00
<div><h3 class="gt-di"> {{ $ .locale .Tr "step2" }} </h3> {{ $ .locale .Tr "repo.pulls.merge_instruction_step2_desc" }} </div>
2022-06-11 17:44:20 +03:00
<div class="ui secondary segment">
<div>git checkout {{ $ .Issue .PullRequest .BaseBranch }} </div>
<div>git merge --no-ff {{ if ne $ .Issue .PullRequest .HeadRepo .ID $ .Issue .PullRequest .BaseRepo .ID }} {{ $ .Issue .PullRequest .HeadRepo .OwnerName }} - {{ end }} {{ $ .Issue .PullRequest .HeadBranch }} </div>
<div>git push origin {{ $ .Issue .PullRequest .BaseBranch }} </div>
</div>
</div>