8bf51da65f
Use JSON attribute instead of inline script --------- Co-authored-by: Nicolas <bircni@icloud.com>
61 lines
2.5 KiB
Handlebars
61 lines
2.5 KiB
Handlebars
{{$data := $.MergeBoxData}}
|
|
{{$pull := $.PullRequest}}
|
|
<div class="divider"></div>
|
|
<details>
|
|
<summary>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_hint"}}</summary>
|
|
<div class="tw-mt-2">
|
|
<div><h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_title"}}</h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_desc"}}</div>
|
|
{{$localBranch := $pull.HeadBranch}}
|
|
{{if ne $pull.HeadRepo.ID $pull.BaseRepo.ID}}
|
|
{{$localBranch = print $pull.HeadRepo.OwnerName "-" $pull.HeadBranch}}
|
|
{{end}}
|
|
<div class="ui secondary segment tw-font-mono">
|
|
{{$gitRemoteName := ctx.RootData.SystemConfig.Repository.GitGuideRemoteName.Value ctx}}
|
|
{{if eq $pull.Flow 0}}
|
|
<div>git fetch -u {{if ne $pull.HeadRepo.ID $pull.BaseRepo.ID}}{{ctx.AppFullLink $pull.HeadRepo.Link}}{{else}}{{$gitRemoteName}}{{end}} {{$pull.HeadBranch}}:{{$localBranch}}</div>
|
|
{{else}}
|
|
<div>git fetch -u {{$gitRemoteName}} {{$pull.GetGitHeadRefName}}:{{$localBranch}}</div>
|
|
{{end}}
|
|
<div>git checkout {{$localBranch}}</div>
|
|
</div>
|
|
{{if $data.ShowMergeInstructions}}
|
|
<div>
|
|
<h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_title"}}</h3>
|
|
{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_desc"}}
|
|
{{if not $data.AutodetectManualMerge}}
|
|
<div>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_warning"}}</div>
|
|
{{end}}
|
|
</div>
|
|
<div class="ui secondary segment tw-font-mono">
|
|
<div data-pull-merge-style="merge">
|
|
<div>git checkout {{$pull.BaseBranch}}</div>
|
|
<div>git merge --no-ff {{$localBranch}}</div>
|
|
</div>
|
|
<div class="tw-hidden" data-pull-merge-style="rebase">
|
|
<div>git checkout {{$pull.BaseBranch}}</div>
|
|
<div>git merge --ff-only {{$localBranch}}</div>
|
|
</div>
|
|
<div class="tw-hidden" data-pull-merge-style="rebase-merge">
|
|
<div>git checkout {{$localBranch}}</div>
|
|
<div>git rebase {{$pull.BaseBranch}}</div>
|
|
<div>git checkout {{$pull.BaseBranch}}</div>
|
|
<div>git merge --no-ff {{$localBranch}}</div>
|
|
</div>
|
|
<div class="tw-hidden" data-pull-merge-style="squash">
|
|
<div>git checkout {{$pull.BaseBranch}}</div>
|
|
<div>git merge --squash {{$localBranch}}</div>
|
|
</div>
|
|
<div class="tw-hidden" data-pull-merge-style="fast-forward-only">
|
|
<div>git checkout {{$pull.BaseBranch}}</div>
|
|
<div>git merge --ff-only {{$localBranch}}</div>
|
|
</div>
|
|
<div class="tw-hidden" data-pull-merge-style="manually-merged">
|
|
<div>git checkout {{$pull.BaseBranch}}</div>
|
|
<div>git merge {{$localBranch}}</div>
|
|
</div>
|
|
<div>git push {{$gitRemoteName}} {{$pull.BaseBranch}}</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
</details>
|