<div dir="ltr"><div><div>Hi Andrew,<br><br></div>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..<br><br></div>Shawn<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Jan 17, 2017 at 4:12 PM, Andrew Maclean <span dir="ltr"><<a href="mailto:andrew.amaclean@gmail.com" target="_blank">andrew.amaclean@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div>Hi All,</div><div>   Look at: <a href="https://gitlab.kitware.com/vtk/vtk/merge_requests/2377" target="_blank">https://gitlab.kitware.<wbr>com/vtk/vtk/merge_requests/<wbr>2377</a></div><div><br></div>This is the message that I am getting:<div>-------<br><div><p dir="auto" style="box-sizing:border-box;margin:0px;color:rgb(92,93,94);font-family:-apple-system,blinkmacsystemfont,"segoe ui",roboto,oxygen-sans,ubuntu,cantarell,"helvetica neue",sans-serif;font-size:14px">Automatic merge failed!</p><p dir="auto" style="box-sizing:border-box;margin:6px 0px 0px;color:rgb(92,93,94);font-family:-apple-system,blinkmacsystemfont,"segoe ui",roboto,oxygen-sans,ubuntu,cantarell,"helvetica neue",sans-serif;font-size:14px"><em style="box-sizing:border-box;margin-top:0px">Error</em>: failed to merge the tree:</p>-------<br>Does anyone know what is going wrong here and how to fix it?<br>Sean is also having the same issue in:</div><div><a href="https://gitlab.kitware.com/vtk/vtk/merge_requests/2171" target="_blank">https://gitlab.kitware.com/<wbr>vtk/vtk/merge_requests/2171</a><br><br>Regards<br><br>   Andrew<br><div class="m_5891765600124873393gmail_signature">______________________________<wbr>_____________<br>Andrew J. P. Maclean<br><br>______________________________<wbr>_____________</div>
</div></div></div>
<br>______________________________<wbr>_________________<br>
Powered by <a href="http://www.kitware.com" rel="noreferrer" target="_blank">www.kitware.com</a><br>
<br>
Visit other Kitware open-source projects at <a href="http://www.kitware.com/opensource/opensource.html" rel="noreferrer" target="_blank">http://www.kitware.com/<wbr>opensource/opensource.html</a><br>
<br>
Search the list archives at: <a href="http://markmail.org/search/?q=vtk-developers" rel="noreferrer" target="_blank">http://markmail.org/search/?q=<wbr>vtk-developers</a><br>
<br>
Follow this link to subscribe/unsubscribe:<br>
<a href="http://public.kitware.com/mailman/listinfo/vtk-developers" rel="noreferrer" target="_blank">http://public.kitware.com/<wbr>mailman/listinfo/vtk-<wbr>developers</a><br>
<br>
<br></blockquote></div><br></div>