[Vtigercrm-developers] Issue with upgraded gitlab on code.vtiger.com

[Alan Lord]

Since the update I have a merge request that is no longer working... I 
just get this screen and it stays there.

On the previous screen it says " There are merge conflicts. Resolve 
these conflicts or ask someone with write access to this repository to 
merge it locally " but there were none when I made the MR and the file 
hasn't been changed in the 7.4.0 branch???

Al


-------------- next part --------------
A non-text attachment was scrubbed...
Name: Screenshot from 2020-12-14 16-55-41.png
Type: image/png
Size: 40298 bytes
Desc: not available
URL: <http://lists.vtigercrm.com/pipermail/vtigercrm-developers/attachments/20201214/a4655d0d/attachment-0001.png>