With --no-ff, create a merge commit in all cases, even when the (#3009)
With --no-ff, create a merge commit in all cases, even when the (#3009)

Merged PR #3009.

GoogleCloudPlatform/magic-modules,GoogleCloudPlatform/magic-modules,GoogleCloudPlatform/magic-modules,GoogleCloudPlatform/magic-modules,GoogleCloudPlatform/magic-modules