githaven/templates/repo/issue/view_content/pull_merge_instruction.tmpl

<div class="divider"></div>
<div class="instruct-toggle"> {{ctx.Locale.Tr "repo.pulls.cmd_instruction_hint"}} </div>
<div class="instruct-content tw-mt-2 gt-hidden">
	<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>
		<div>git checkout {{$localBranch}}</div>
		{{else}}
		<div>git fetch -u origin {{.GetGitRefName}}:{{$localBranch}}</div>
		{{end}}
	</div>
	{{if .ShowMergeInstructions}}
	<div><h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_title"}}</h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_desc"}}</div>
	<div class="ui secondary segment">
		<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>
		<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>
		<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>
	</div>
	{{end}}
</div>