ba1e3405d6
- A minor change that replaces the usages of `git checkout` to `git switch` in the UI. `git switch` is preferred over `git checkout` by git. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7385 Reviewed-by: Gusted <gusted@noreply.codeberg.org> Reviewed-by: Beowulf <beowulf@beocode.eu> Co-authored-by: Lucas Grzegorczyk <furai@thd.vg> Co-committed-by: Lucas Grzegorczyk <furai@thd.vg>
57 lines
2.5 KiB
Go HTML Template
57 lines
2.5 KiB
Go HTML Template
<div class="divider"></div>
|
|
<details class="collapsible">
|
|
<summary class="tw-py-2"> {{ctx.Locale.Tr "repo.pulls.cmd_instruction_hint"}} </summary>
|
|
<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}}
|
|
<div class="ui secondary segment">
|
|
{{if eq .PullRequest.Flow 0}}
|
|
<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>
|
|
{{else}}
|
|
<div>git fetch -u origin +refs/pull/{{.PullRequest.Index}}/head:{{$localBranch}}</div>
|
|
{{end}}
|
|
<div>git switch {{$localBranch}}</div>
|
|
</div>
|
|
{{if .ShowMergeInstructions}}
|
|
<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>
|
|
<div class="ui secondary segment">
|
|
<div data-pull-merge-style="merge">
|
|
<div>git switch {{.PullRequest.BaseBranch}}</div>
|
|
<div>git merge --no-ff {{$localBranch}}</div>
|
|
</div>
|
|
<div class="tw-hidden" data-pull-merge-style="rebase">
|
|
<div>git switch {{$localBranch}}</div>
|
|
<div>git rebase {{.PullRequest.BaseBranch}}</div>
|
|
<div>git switch {{.PullRequest.BaseBranch}}</div>
|
|
<div>git merge --ff-only {{$localBranch}}</div>
|
|
</div>
|
|
<div class="tw-hidden" data-pull-merge-style="rebase-merge">
|
|
<div>git switch {{$localBranch}}</div>
|
|
<div>git rebase {{.PullRequest.BaseBranch}}</div>
|
|
<div>git switch {{.PullRequest.BaseBranch}}</div>
|
|
<div>git merge --no-ff {{$localBranch}}</div>
|
|
</div>
|
|
<div class="tw-hidden" data-pull-merge-style="squash">
|
|
<div>git switch {{.PullRequest.BaseBranch}}</div>
|
|
<div>git merge --squash {{$localBranch}}</div>
|
|
</div>
|
|
<div class="tw-hidden" data-pull-merge-style="fast-forward-only">
|
|
<div>git switch {{.PullRequest.BaseBranch}}</div>
|
|
<div>git merge --ff-only {{$localBranch}}</div>
|
|
</div>
|
|
<div class="tw-hidden" data-pull-merge-style="manually-merged">
|
|
<div>git switch {{.PullRequest.BaseBranch}}</div>
|
|
<div>git merge {{$localBranch}}</div>
|
|
</div>
|
|
<div>git push origin {{.PullRequest.BaseBranch}}</div>
|
|
</div>
|
|
{{end}}
|
|
</details>
|