Skip to content

Update doc/user/project/merge_requests/squash_and_merge.md

John Woods requested to merge jwoods06-master-patch-41260 into master

What does this MR do?

Update the "squash and merge" documentation to be a little more clear that the merged branch still retains all the commit history and messages in full and it isn't in "squashed" form.

Does this MR meet the acceptance criteria?

Conformity

Performance and testing

Simple adding of text. There should be no risk of performance or testing impact.

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team

Merge request reports