Squash doesn't work reliably or provide right feedback
ZenDesk: https://gitlab.zendesk.com/agent/tickets/115650
Customer is using fast-foward merge setting and users often hit "Merge". The UI indicates that it is merging, but it doesn't appear to do so.
Minutes later, the Fast-foward merge is not possible
error shows up:
They click Rebase
, that somehow fails, and then the Merge
button shows up again. The endless cycle repeats.
Unfortunately, the support team was not able to get the right logs (e.g. githost.log
) to get more detail.
There are probably a number of issues here:
- We don't show any error messages when squash/rebase fails: https://gitlab.com/gitlab-org/gitlab-ce/issues/48132
- We need to prune stale worktrees beforehand: gitaly#1451 (closed), gitaly#1551 (closed)
- Others?
In general, we probably haven't done a thorough failure analysis and code review for how that is handled, how we might improve the reliability of this feature. This issue really serves to do a full code audit/walkthrough to make sure the frontend/backend are working properly.
Customers
https://gitlab.my.salesforce.com/00161000004zrF8
https://gitlab.my.salesforce.com/00161000013aRjG