|
485 | 485 | {{end}} |
486 | 486 | </div> |
487 | 487 | </div> |
488 | | - <div class="instruct-toggle ml-3"> {{$.i18n.Tr "repo.pulls.merge_instruction_hint" | Safe}} </div> |
489 | | - <div class="instruct-content" style="display:none"> |
490 | | - <div class="ui divider"></div> |
491 | | - <div><h3 class="di">{{$.i18n.Tr "step1"}} </h3>{{$.i18n.Tr "repo.pulls.merge_instruction_step1_desc"}}</div> |
492 | | - <div class="ui secondary segment"> |
493 | | - {{if eq .Issue.PullRequest.Flow 0}} |
494 | | - <div>git checkout -b {{if ne .Issue.PullRequest.HeadRepo.ID .Issue.PullRequest.BaseRepo.ID}}{{.Issue.PullRequest.HeadRepo.OwnerName}}-{{end}}{{.Issue.PullRequest.HeadBranch}} {{.Issue.PullRequest.BaseBranch}}</div> |
495 | | - <div>git pull {{if ne .Issue.PullRequest.HeadRepo.ID .Issue.PullRequest.BaseRepo.ID}}{{.Issue.PullRequest.HeadRepo.HTMLURL}}{{else}}origin{{end}} {{.Issue.PullRequest.HeadBranch}}</div> |
496 | | - {{else}} |
497 | | - <div>git fetch origin {{.Issue.PullRequest.GetGitRefName}}:{{.Issue.PullRequest.HeadBranch}}</div> |
498 | | - {{end}} |
499 | | - </div> |
500 | | - <div><h3 class="di">{{$.i18n.Tr "step2"}} </h3>{{$.i18n.Tr "repo.pulls.merge_instruction_step2_desc"}}</div> |
501 | | - <div class="ui secondary segment"> |
502 | | - <div>git checkout {{.Issue.PullRequest.BaseBranch}}</div> |
503 | | - <div>git merge --no-ff {{if ne .Issue.PullRequest.HeadRepo.ID .Issue.PullRequest.BaseRepo.ID}}{{.Issue.PullRequest.HeadRepo.OwnerName}}-{{end}}{{.Issue.PullRequest.HeadBranch}}</div> |
504 | | - <div>git push origin {{.Issue.PullRequest.BaseBranch}}</div> |
| 488 | + {{if .ShowMergeInstructions}} |
| 489 | + <div class="instruct-toggle ml-3"> {{$.i18n.Tr "repo.pulls.merge_instruction_hint" | Safe}} </div> |
| 490 | + <div class="instruct-content" style="display:none"> |
| 491 | + <div class="ui divider"></div> |
| 492 | + <div><h3 class="di">{{$.i18n.Tr "step1"}} </h3>{{$.i18n.Tr "repo.pulls.merge_instruction_step1_desc"}}</div> |
| 493 | + <div class="ui secondary segment"> |
| 494 | + {{if eq .Issue.PullRequest.Flow 0}} |
| 495 | + <div>git checkout -b {{if ne .Issue.PullRequest.HeadRepo.ID .Issue.PullRequest.BaseRepo.ID}}{{.Issue.PullRequest.HeadRepo.OwnerName}}-{{end}}{{.Issue.PullRequest.HeadBranch}} {{.Issue.PullRequest.BaseBranch}}</div> |
| 496 | + <div>git pull {{if ne .Issue.PullRequest.HeadRepo.ID .Issue.PullRequest.BaseRepo.ID}}{{.Issue.PullRequest.HeadRepo.HTMLURL}}{{else}}origin{{end}} {{.Issue.PullRequest.HeadBranch}}</div> |
| 497 | + {{else}} |
| 498 | + <div>git fetch origin {{.Issue.PullRequest.GetGitRefName}}:{{.Issue.PullRequest.HeadBranch}}</div> |
| 499 | + {{end}} |
| 500 | + </div> |
| 501 | + <div><h3 class="di">{{$.i18n.Tr "step2"}} </h3>{{$.i18n.Tr "repo.pulls.merge_instruction_step2_desc"}}</div> |
| 502 | + <div class="ui secondary segment"> |
| 503 | + <div>git checkout {{.Issue.PullRequest.BaseBranch}}</div> |
| 504 | + <div>git merge --no-ff {{if ne .Issue.PullRequest.HeadRepo.ID .Issue.PullRequest.BaseRepo.ID}}{{.Issue.PullRequest.HeadRepo.OwnerName}}-{{end}}{{.Issue.PullRequest.HeadBranch}}</div> |
| 505 | + <div>git push origin {{.Issue.PullRequest.BaseBranch}}</div> |
| 506 | + </div> |
505 | 507 | </div> |
506 | | - </div> |
| 508 | + {{end}} |
507 | 509 | {{else}} |
508 | 510 | <div class="ui divider"></div> |
509 | 511 | <div class="item text red"> |
|
0 commit comments