From 558005a5ea8d3996bfd45fbf645a1e2583eae946 Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 15 Jul 2025 09:48:14 +0200 Subject: [PATCH] Use monospace font in PR command line instructions (#35074) Before: Screenshot 2025-07-14 at 17 17 11 After: Screenshot 2025-07-14 at 17 17 22 Co-authored-by: Giteabot --- templates/repo/issue/view_content/pull_merge_instruction.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/issue/view_content/pull_merge_instruction.tmpl b/templates/repo/issue/view_content/pull_merge_instruction.tmpl index a1cff41a3a2..7362908c557 100644 --- a/templates/repo/issue/view_content/pull_merge_instruction.tmpl +++ b/templates/repo/issue/view_content/pull_merge_instruction.tmpl @@ -7,7 +7,7 @@ {{if ne .PullRequest.HeadRepo.ID .PullRequest.BaseRepo.ID}} {{$localBranch = print .PullRequest.HeadRepo.OwnerName "-" .PullRequest.HeadBranch}} {{end}} -
+
{{if eq .PullRequest.Flow 0}}
git fetch -u {{if ne .PullRequest.HeadRepo.ID .PullRequest.BaseRepo.ID}}{{else}}origin{{end}} {{.PullRequest.HeadBranch}}:{{$localBranch}}
{{else}} @@ -23,7 +23,7 @@
{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_warning"}}
{{end}}
-
+
git checkout {{.PullRequest.BaseBranch}}
git merge --no-ff {{$localBranch}}