We have protected develop and master branches. I have developed new feature in a feature branch and posted the merge request. But there is a conflict and gitlab refuses to merge the feature branch. It provides the following instructions for manual command line resolution:
The last step will fail because we cannot push to the develop branch. Is it bug?