<div dir="ltr"><div class="gmail_default" style="font-size:small">I have been seeing this message in relation to vtk-m:</div><div class="gmail_default" style="font-size:small;display:inline">​   ​</div>git “local changes checked into the index but not commited”<div><div class="gmail_default" style="font-size:small">​This is what I see in gitk:</div><div class="gmail_default" style="font-size:small">-----------------</div><div class="gmail_default">Author:   </div><div class="gmail_default">Committer:   </div><div class="gmail_default">Parent: e74451f07bc90d3671e69634494a10e6d556789a (Merge topic 'increment-master-version-number')</div><div class="gmail_default">Branch: </div><div class="gmail_default">Follows: </div><div class="gmail_default">Precedes: </div><div class="gmail_default"><br></div><div class="gmail_default">    Local uncommitted changes, not checked in to index</div><div class="gmail_default"><br></div><div class="gmail_default">---------------------------- ThirdParty/vtkm/vtk-m ----------------------------</div><div class="gmail_default">Submodule ThirdParty/vtkm/vtk-m contains untracked content</div><div class="gmail_default">Submodule ThirdParty/vtkm/vtk-m contains modified content</div><div class="gmail_default">Submodule ThirdParty/vtkm/vtk-m 891cfe4..3f60845:</div><div class="gmail_default">  > Merge topic 'new-virtual-objects'</div><div class="gmail_default">  > Merge topic 'remove_vtkm_override'<span style="font-size:small">​</span></div><div class="gmail_default"><span style="font-size:small"><br></span></div><div class="gmail_default"><span style="font-size:small">----------</span></div><br><div><div class="gmail_default" style="font-size:small">So after finally giving up trying to fix this, I did a fresh checkout and I now get this:</div><div class="gmail_default" style="font-size:small"><br></div><div class="gmail_default">$ git submodule update --init</div><div class="gmail_default">Submodule 'VTK-m' (<a href="https://gitlab.kitware.com/vtk/vtk-m.git">https://gitlab.kitware.com/vtk/vtk-m.git</a>) registered for path 'ThirdParty/vtkm/vtk-m'</div><div class="gmail_default">Cloning into 'C:/Development/Kitware/src/VTK/ThirdParty/vtkm/vtk-m'...</div><div class="gmail_default">git: 'lfs' is not a git command. See 'git --help'.</div><div class="gmail_default"><br></div><div class="gmail_default">Did you mean this?</div><div class="gmail_default">        flow</div><div class="gmail_default">error: external filter git lfs smudge %f failed 1</div><div class="gmail_default">error: external filter git lfs smudge %f failed</div><div class="gmail_default">fatal: data/sample.cosmotools: smudge filter lfs failed</div><div class="gmail_default">Unable to checkout '891cfe4aec626d7e07e184a5bd92c48405714b69' in submodule path 'ThirdParty/vtkm/vtk-m'</div><div class="gmail_default"><br></div><div class="gmail_default" style="font-size:small"> If you run  git submodule update --init​ again you get something like this:</div><div class="gmail_default" style="font-size:small"><div class="gmail_default">error: The following untracked working tree files would be overwritten by checkout:</div><div class="gmail_default">        .clang-format</div><div class="gmail_default">        .gitattributes</div><div class="gmail_default">        CMake/FindEGL.cmake</div><div class="gmail_default">        CMake/FindGLEW.cmake</div><div class="gmail_default">        CMake/FindGLFW.cmake</div><div class="gmail_default">        CMake/FindMESA.cmake</div><div class="gmail_default">        CMake/FindPyexpander.cmake</div><div class="gmail_default">        CMake/FindTBB.cmake</div><div class="gmail_default">        CMake/FindThrust.cmake</div><div class="gmail_default">        CMake/<a href="http://TestBuild.cxx.in">TestBuild.cxx.in</a></div><div class="gmail_default">        CMake/VTKmBuildDocumentation.cmake</div><div class="gmail_default">  ... </div><div class="gmail_default"><div class="gmail_default">Please move or remove them before you can switch branches.</div><div class="gmail_default">Aborting</div><div class="gmail_default">Unable to checkout '891cfe4aec626d7e07e184a5bd92c48405714b69' in submodule path 'ThirdParty/vtkm/vtk-m'</div><div><br></div></div><div class="gmail_default"><br></div><div class="gmail_default">Does anyone know what is going on?</div></div><br></div><div><br></div><div><br></div><div><div class="gmail_default" style="font-size:small">​Thanks</div><div class="gmail_default" style="font-size:small">   Andrew​</div><br></div>-- <br><div class="gmail_signature">___________________________________________<br>Andrew J. P. Maclean<br><br>___________________________________________</div>
</div></div>