[vtk-developers] GitLab automatic merge not working.
shawn.waldon at kitware.com
Tue Jan 17 16:19:05 EST 2017
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..
On Tue, Jan 17, 2017 at 4:12 PM, Andrew Maclean <andrew.amaclean at gmail.com>
> 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:
> Andrew J. P. Maclean
> Powered by www.kitware.com
> Visit other Kitware open-source projects at http://www.kitware.com/
> Search the list archives at: http://markmail.org/search/?q=vtk-developers
> Follow this link to subscribe/unsubscribe:
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the vtk-developers