2019-04-30: 11.10.5 exception request for gitlab-org/gitaly!1214
Exception request
- Merge request to be considered for picking: gitlab-org/gitaly!1214 (merged)
Why it needs to be picked
The squash button frequently fails because the patch generated in a merge request does not apply perfectly to the target branch.
This has confused many customers and team members. For one customer, failures to merge due to squash are one of the most frequent complaints about GitLab.
Potential negative impact of picking
The merge request introduces the use of a 3-way merge to apply the squashed patch. There are cases where this could lead to a bad merge.
However, given this is how git merge
works anyway, we would at least be consistent with how Git behaves while reducing the failure rate of
squashed merges.
Release manager sign-off
(Assign this issue to RMs managing this release. See https://about.gitlab.com/release-managers/)
A release manager (not a trainee) needs to provide initial approval for this exception request.
Mention others as necessary during discussion.
-
Senior Director of Development: @clefelhocz1
Sign-off for patch release (delete this section if RC)
Upon initial approval, the release manager will then ping and assign one more role for final approval:
-
One of: - Engineering Manager: @marin
- Director of Engineering department
- Senior Director of Development
- Engineering Manager, Quality
- VPE
After approval
Check that the following is accurate before closing this issue:
-
gitlab-org/gitaly!1214 (merged) has the correct milestone and label set so that the release managers will pick it. -
gitlab-org/gitaly!1214 (merged) has a comment with a link to this issue: - Exception approved in ISSUE_LINK