Docs feedback: Fast Forward Merge Requests seems to be incorrect about squashes

Problem to solve

The Docs article on Fast Forward Merges states that it's not possible to use squashing during merge if you have fast forward merges enabled. However, via some testing, @cynthia was able to successfully do a squash merge with fast-forwarding enabled, here.

Steps to reproduce

Have Fast forward in Merge method settings:

image

Have Squash settings on encourage/require or so that it can be enabled for a specific MR:

image

Create a MR with multiple commits. Then merge wish squash on.

Example MR: https://gitlab.com/gitlab-gold/ci-basic-tests/ci-only/-/merge_requests/18

Further details

This was discovered while working with a customer via this ticket (internal link only).

Proposal

We should perform some more testing to ensure the feature works as expected, and update the docs accordingly. This potentially also impacts the Squash and merge docs.

Edited by Cynthia "Arty" Ng