Can't merge the feature branch even if no conflict

How to Use GitLab
1

I create a feature branch based on develop, and make some changes on feature branch. When I try to merge the feature branch to develop, the gitlab prompts that “Merge blocked: merge conflicts must be resolved”. But actually, there is no conflict between these two branch.

BTW, the issue occured after upgrade the Gitlab 15.6.0.

企业微信截图_16728244949552
企业微信截图_167282449495521082×184 8.06 KB

2

I am facing same issue. Did you find the solution?

3

Is there any solution for this? Do we have open bug for tracking this?

4

Search here or open an issue to report a bug if you believe it to be a bug: Issues · GitLab.org / GitLab · GitLab