'GitLab issue: No conflicts in the commit but still get "Merge blocked: To merge this request, first rebase locally"
We always get this message in Gitlab: "Merge blocked: fast-forward merge is not possible. To merge this request, first rebase locally" even when we do not have any conflicts in our commits.
The strange thing is just two members of a team of six have this problem, actually, another member had this issue, but it has resolved itself after a while. Also, I heard some members of other teams have this problem occasionally.
This issue could be very annoying because sometimes, another commit could be merged while rebasing locally or waiting for the pipeline. You get this message again, so you should repeat the whole process and cross your fingers...
Do you have any suggestions for solving this annoying and time-wasting issue?
Sources
This article follows the attribution requirements of Stack Overflow and is licensed under CC BY-SA 3.0.
Source: Stack Overflow
| Solution | Source |
|---|