[vtk-developers] Stupid git problem #1
Scott, W Alan
wascott at sandia.gov
Wed Apr 28 15:31:07 EDT 2010
I have a git clone, and want to update it. I have done nothing to the git clone - no editing whatsoever.
When I do a git pull, I get the following:
error: Entry 'Applications/AdaptiveParaView/Plugin/vtkACosmoReader.cxx' not uptodate. Cannot merge.
Any ideas? Did the file go away in the trunk, and git doesn't know to just delete it?
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the vtk-developers