Squash/rebase doesn't work reliably or provide right feedback
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:
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: gitlab-ce#48132 (closed)
- We need to prune stale worktrees beforehand: gitaly#1451 (closed), gitaly#1551 (closed)
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.