2023-06-29 08:24:22 -04:00
|
|
|
<div class="divider"></div>
|
2024-07-08 13:32:59 -04:00
|
|
|
<details class="collapsible">
|
2024-08-09 12:14:19 -04:00
|
|
|
<summary class="tw-py-2"> {{ctx.Locale.Tr "repo.pulls.cmd_instruction_hint"}} </summary>
|
2023-10-25 11:01:31 -04: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 10:44:20 -04:00
|
|
|
<div class="ui secondary segment">
|
2023-10-25 11:01:31 -04:00
|
|
|
{{if eq .PullRequest.Flow 0}}
|
2024-07-13 12:05:08 -04:00
|
|
|
<div>git fetch -u {{if ne .PullRequest.HeadRepo.ID .PullRequest.BaseRepo.ID}}<origin-url data-url="{{.PullRequest.HeadRepo.Link}}"></origin-url>{{else}}origin{{end}} {{.PullRequest.HeadBranch}}:{{$localBranch}}</div>
|
2022-06-11 10:44:20 -04:00
|
|
|
{{else}}
|
2024-07-13 12:05:08 -04:00
|
|
|
<div>git fetch -u origin +refs/pull/{{.PullRequest.Index}}/head:{{$localBranch}}</div>
|
2022-06-11 10:44:20 -04:00
|
|
|
{{end}}
|
2024-07-13 12:05:08 -04:00
|
|
|
<div>git checkout {{$localBranch}}</div>
|
2022-06-11 10:44:20 -04:00
|
|
|
</div>
|
2023-10-25 11:01:31 -04:00
|
|
|
{{if .ShowMergeInstructions}}
|
2024-08-09 21:09:34 -04:00
|
|
|
<div id="merge-instructions">
|
|
|
|
<h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_title"}}</h3>
|
|
|
|
{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_desc"}}
|
|
|
|
{{if not .AutodetectManualMerge}}
|
|
|
|
<p>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_warning"}}</p>
|
|
|
|
{{end}}
|
|
|
|
</div>
|
2022-06-11 10:44:20 -04:00
|
|
|
<div class="ui secondary segment">
|
2023-10-25 11:01:31 -04:00
|
|
|
<div data-pull-merge-style="merge">
|
|
|
|
<div>git checkout {{.PullRequest.BaseBranch}}</div>
|
|
|
|
<div>git merge --no-ff {{$localBranch}}</div>
|
|
|
|
</div>
|
2024-03-24 14:23:38 -04:00
|
|
|
<div class="tw-hidden" data-pull-merge-style="rebase">
|
2024-07-31 05:36:46 -04:00
|
|
|
<div>git checkout {{$localBranch}}</div>
|
|
|
|
<div>git rebase {{.PullRequest.BaseBranch}}</div>
|
2023-10-25 11:01:31 -04:00
|
|
|
<div>git checkout {{.PullRequest.BaseBranch}}</div>
|
|
|
|
<div>git merge --ff-only {{$localBranch}}</div>
|
|
|
|
</div>
|
2024-03-24 14:23:38 -04:00
|
|
|
<div class="tw-hidden" data-pull-merge-style="rebase-merge">
|
2023-10-25 11:01:31 -04:00
|
|
|
<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>
|
2024-03-24 14:23:38 -04:00
|
|
|
<div class="tw-hidden" data-pull-merge-style="squash">
|
2023-10-25 11:01:31 -04:00
|
|
|
<div>git checkout {{.PullRequest.BaseBranch}}</div>
|
|
|
|
<div>git merge --squash {{$localBranch}}</div>
|
|
|
|
</div>
|
2024-03-24 14:23:38 -04:00
|
|
|
<div class="tw-hidden" data-pull-merge-style="fast-forward-only">
|
2024-02-12 17:37:23 -05:00
|
|
|
<div>git checkout {{.PullRequest.BaseBranch}}</div>
|
|
|
|
<div>git merge --ff-only {{$localBranch}}</div>
|
|
|
|
</div>
|
2024-03-24 14:23:38 -04:00
|
|
|
<div class="tw-hidden" data-pull-merge-style="manually-merged">
|
2023-10-25 11:01:31 -04:00
|
|
|
<div>git checkout {{.PullRequest.BaseBranch}}</div>
|
|
|
|
<div>git merge {{$localBranch}}</div>
|
|
|
|
</div>
|
|
|
|
<div>git push origin {{.PullRequest.BaseBranch}}</div>
|
2022-06-11 10:44:20 -04:00
|
|
|
</div>
|
2023-10-25 11:01:31 -04:00
|
|
|
{{end}}
|
2024-07-08 13:32:59 -04:00
|
|
|
</details>
|