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

[Uma S]

Hi Alan,

Yes! We have noticed this issue, where our operation team is working on it.
Still the upgrade is not finalized.

On Mon, Dec 14, 2020 at 10:32 PM Alan Lord <alanslists at gmail.com> wrote:

> 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
>
>
> _______________________________________________
> http://www.vtiger.com/



-- 
With
Best Regards
Uma.S
Vtiger Team
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.vtigercrm.com/pipermail/vtigercrm-developers/attachments/20201214/3c682a37/attachment.html>