2023-06-29 15:24:22 +03:00
<div class="divider"></div>
2024-02-22 20:02:33 +03:00
<div class="instruct-toggle"> {{ ctx .Locale .Tr "repo.pulls.cmd_instruction_hint" }} </div>
2023-02-19 07:06:14 +03:00
<div class="instruct-content gt-mt-3 gt-hidden">
2023-10-25 18:01:31 +03:00
<div><h3> {{ ctx .Locale .Tr "repo.pulls.cmd_instruction_checkout_title" }} </h3> {{ ctx .Locale .Tr "repo.pulls.cmd_instruction_checkout_desc" }} </div>
{{ $ localBranch : = .PullRequest .HeadBranch }}
{{ if ne .PullRequest .HeadRepo .ID .PullRequest .BaseRepo .ID }}
{{ $ localBranch = print .PullRequest .HeadRepo .OwnerName "-" .PullRequest .HeadBranch }}
{{ end }}
2022-06-11 17:44:20 +03:00
<div class="ui secondary segment">
2023-10-25 18:01:31 +03:00
{{ if eq .PullRequest .Flow 0 }}
<div>git fetch -u {{ if ne .PullRequest .HeadRepo .ID .PullRequest .BaseRepo .ID }} <gitea-origin-url data-url=" {{ .PullRequest .HeadRepo .Link }} "></gitea-origin-url> {{ else }} origin {{ end }} {{ .PullRequest .HeadBranch }} : {{ $ localBranch }} </div>
<div>git checkout {{ $ localBranch }} </div>
2022-06-11 17:44:20 +03:00
{{ else }}
2023-10-25 18:01:31 +03:00
<div>git fetch -u origin {{ .GetGitRefName }} : {{ $ localBranch }} </div>
2022-06-11 17:44:20 +03:00
{{ end }}
</div>
2023-10-25 18:01:31 +03:00
{{ if .ShowMergeInstructions }}
<div><h3> {{ ctx .Locale .Tr "repo.pulls.cmd_instruction_merge_title" }} </h3> {{ ctx .Locale .Tr "repo.pulls.cmd_instruction_merge_desc" }} </div>
2022-06-11 17:44:20 +03:00
<div class="ui secondary segment">
2023-10-25 18:01:31 +03:00
<div data-pull-merge-style="merge">
<div>git checkout {{ .PullRequest .BaseBranch }} </div>
<div>git merge --no-ff {{ $ localBranch }} </div>
</div>
<div class="gt-hidden" data-pull-merge-style="rebase">
<div>git checkout {{ .PullRequest .BaseBranch }} </div>
<div>git merge --ff-only {{ $ localBranch }} </div>
</div>
<div class="gt-hidden" data-pull-merge-style="rebase-merge">
<div>git checkout {{ $ localBranch }} </div>
<div>git rebase {{ .PullRequest .BaseBranch }} </div>
<div>git checkout {{ .PullRequest .BaseBranch }} </div>
<div>git merge --no-ff {{ $ localBranch }} </div>
</div>
<div class="gt-hidden" data-pull-merge-style="squash">
<div>git checkout {{ .PullRequest .BaseBranch }} </div>
<div>git merge --squash {{ $ localBranch }} </div>
</div>
2024-02-13 01:37:23 +03:00
<div class="gt-hidden" data-pull-merge-style="fast-forward-only">
<div>git checkout {{ .PullRequest .BaseBranch }} </div>
<div>git merge --ff-only {{ $ localBranch }} </div>
</div>
2023-10-25 18:01:31 +03:00
<div class="gt-hidden" data-pull-merge-style="manually-merged">
<div>git checkout {{ .PullRequest .BaseBranch }} </div>
<div>git merge {{ $ localBranch }} </div>
</div>
<div>git push origin {{ .PullRequest .BaseBranch }} </div>
2022-06-11 17:44:20 +03:00
</div>
2023-10-25 18:01:31 +03:00
{{ end }}
2022-06-11 17:44:20 +03:00
</div>