[vtk-developers] GitLab automatic merge not working.

[Ben Boeckel]

On Wed, Jan 18, 2017 at 08:12:18 +1100, Andrew Maclean 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

Yeah, sorry about that. The robot has been hiccupping at times with
little to no indication of what went wrong; just ping me (or anyone else
with Master and up permissions really) if you see it.

--Ben