<div dir="ltr"><div>Hi All,</div><div>   Look at: <a href="https://gitlab.kitware.com/vtk/vtk/merge_requests/2377">https://gitlab.kitware.com/vtk/vtk/merge_requests/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">https://gitlab.kitware.com/vtk/vtk/merge_requests/2171</a><br><br>Regards<br><br>   Andrew<br><div class="gmail_signature">___________________________________________<br>Andrew J. P. Maclean<br><br>___________________________________________</div>
</div></div></div>