Check out instructions wrong in merge request for fast-forward merge strategy

Summary

If you set up your project to use fast-forward merge strategy for merge request, the “check out branch“ instruction show the “default” instruction for the merge commit strategy.

Steps to reproduce

1. Set up a new project.
2. Go to project settings and set merge request strategy to “fast-forward merge”.
3. Create a merge request.
4. Click on “Check out branch“.
5. See (wrong) instructions.

What is the current bug behavior?

In step 5 the following instructions are shown:

What is the expected correct behavior?

“Step 3” in the instructions should be different (see below).

Relevant logs and/or screenshots

Possible fixes

Chang step 3 to:

Step 3. Rebase onto master, fix any conflicts that come up and do a fast-forward merge onto master:

git rebase master
git checkout master
git merge --ff-only <your-feature-branch>