[vtk-developers] Stupid git problem #1
Scott, W Alan
wascott at sandia.gov
Wed Apr 28 18:34:28 EDT 2010
I actually blew the tree away and started from scratch (again - grrr). I will try git status next time.
From: David E DeMarle [mailto:dave.demarle at kitware.com]
Sent: Wednesday, April 28, 2010 3:57 PM
To: Scott, W Alan
Cc: VTK Developers
Subject: Re: [vtk-developers] Stupid git problem #1
That file is still in master last I checked.
For whatever reason, git is saying that your copy has a change in it.
What does git status say?
David E DeMarle
28 Corporate Drive
Clifton Park, NY 12065-8662
Phone: 518-371-3971 x109
On Wed, Apr 28, 2010 at 3:31 PM, Scott, W Alan <wascott at sandia.gov> wrote:
> not uptodate. Cannot merge.
More information about the vtk-developers