[vtk-developers] Stupid git problem #1

[Scott, W Alan]

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:

Updating b401319..4f96c80
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?

Thanks,

Alan
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/vtk-developers/attachments/20100428/4773ade6/attachment.html>