[vtk-developers] GitLab automatic merge not working.

[Shawn Waldon]

Hi Andrew,

It is a bug somewhere in the 'kitware robot' merge code.  We see it happen
off and on.  Ben is working on it, so I pinged him on the merge requests in
question and copied him on this..

Shawn

On Tue, Jan 17, 2017 at 4:12 PM, Andrew Maclean <andrew.amaclean at gmail.com>
wrote:

> 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
>
> ___________________________________________
>
> _______________________________________________
> Powered by www.kitware.com
>
> Visit other Kitware open-source projects at http://www.kitware.com/
> opensource/opensource.html
>
> Search the list archives at: http://markmail.org/search/?q=vtk-developers
>
> Follow this link to subscribe/unsubscribe:
> http://public.kitware.com/mailman/listinfo/vtk-developers
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/vtk-developers/attachments/20170117/decc978c/attachment-0001.html>