diff --git a/templates/repo/empty.tmpl b/templates/repo/empty.tmpl
index d3a81bc51d..2032b7e5d2 100644
--- a/templates/repo/empty.tmpl
+++ b/templates/repo/empty.tmpl
@@ -51,7 +51,7 @@
 								<div class="markup">
 									<pre><code>touch README.md
 git init
-{{if ne .Repository.DefaultBranch "master"}}git checkout -b {{.Repository.DefaultBranch}}{{end}}
+{{if ne .Repository.DefaultBranch "master"}}git switch -c {{.Repository.DefaultBranch}}{{end}}
 git add README.md
 git commit -m "first commit"
 git remote add origin <span class="js-clone-url">{{$.CloneButtonOriginLink.HTTPS}}</span>
diff --git a/templates/repo/issue/view_content/pull_merge_instruction.tmpl b/templates/repo/issue/view_content/pull_merge_instruction.tmpl
index b7aae53424..dd30a3a8d6 100644
--- a/templates/repo/issue/view_content/pull_merge_instruction.tmpl
+++ b/templates/repo/issue/view_content/pull_merge_instruction.tmpl
@@ -12,7 +12,7 @@
 		{{else}}
 			<div>git fetch -u origin +refs/pull/{{.PullRequest.Index}}/head:{{$localBranch}}</div>
 		{{end}}
-		<div>git checkout {{$localBranch}}</div>
+		<div>git switch {{$localBranch}}</div>
 	</div>
 	{{if .ShowMergeInstructions}}
 	<div id="merge-instructions">
@@ -24,31 +24,31 @@
 	</div>
 	<div class="ui secondary segment">
 		<div data-pull-merge-style="merge">
-			<div>git checkout {{.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="rebase">
-			<div>git checkout {{$localBranch}}</div>
+			<div>git switch {{$localBranch}}</div>
 			<div>git rebase {{.PullRequest.BaseBranch}}</div>
-			<div>git checkout {{.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 checkout {{$localBranch}}</div>
+			<div>git switch {{$localBranch}}</div>
 			<div>git rebase {{.PullRequest.BaseBranch}}</div>
-			<div>git checkout {{.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 checkout {{.PullRequest.BaseBranch}}</div>
+			<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 checkout {{.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="manually-merged">
-			<div>git checkout {{.PullRequest.BaseBranch}}</div>
+			<div>git switch {{.PullRequest.BaseBranch}}</div>
 			<div>git merge {{$localBranch}}</div>
 		</div>
 		<div>git push origin {{.PullRequest.BaseBranch}}</div>