diff --git a/templates/repo/issue/view_content/pull_merge_instruction.tmpl b/templates/repo/issue/view_content/pull_merge_instruction.tmpl index e89102802a..62605ad730 100644 --- a/templates/repo/issue/view_content/pull_merge_instruction.tmpl +++ b/templates/repo/issue/view_content/pull_merge_instruction.tmpl @@ -22,6 +22,8 @@ <div>git merge --no-ff {{$localBranch}}</div> </div> <div class="tw-hidden" data-pull-merge-style="rebase"> + <div>git checkout {{$localBranch}}</div> + <div>git rebase {{.PullRequest.BaseBranch}}</div> <div>git checkout {{.PullRequest.BaseBranch}}</div> <div>git merge --ff-only {{$localBranch}}</div> </div>