[vtk-developers] GitLab automatic merge not working.

[Andrew Maclean]

Hi All,
   Look at: https://gitlab.kitware.com/vtk/vtk/merge_requests/2377

This is the message that I am getting:
-------

Automatic merge failed!

*Error*: failed to merge the tree:
-------
Does anyone know what is going wrong here and how to fix it?
Sean is also having the same issue in:
https://gitlab.kitware.com/vtk/vtk/merge_requests/2171

Regards

   Andrew
___________________________________________
Andrew J. P. Maclean

___________________________________________
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/vtk-developers/attachments/20170118/91d0a0dc/attachment.html>