[prev in list] [next in list] [prev in thread] [next in thread] 

List:       vtk-developers
Subject:    Re: [vtk-developers] Stupid git problem #1
From:       "Scott, W Alan" <wascott () sandia ! gov>
Date:       2010-04-28 22:34:28
Message-ID: 56F66A9F02F8DD40B540440CEE290BEB88E5A8AB83 () ES03SNLNT ! srn ! sandia ! gov
[Download RAW message or body]

I actually blew the tree away and started from scratch (again - grrr).  I will try git status next time.

Thanks,

Alan

-----Original Message-----
From: David E DeMarle [mailto:dave.demarle@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
Kitware, Inc.
R&D Engineer
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@sandia.gov> wrote:
> not uptodate. Cannot merge.


_______________________________________________
Powered by www.kitware.com

Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://www.vtk.org/mailman/listinfo/vtk-developers

[prev in list] [next in list] [prev in thread] [next in thread]