Re: pull into dirty working tree

From: Bill Lear <rael@zopyra.com>
Date: Jun 13, 2007, 16:30 UTC
Message-ID: <18032.7078.656285.877958@lisa.zopyra.com>
In-Reply-To: <Pine.LNX.4.64.0706131702020.4059@racer.site>

On Wednesday, June 13, 2007 at 17:07:20 (+0100) Johannes Schindelin writes:

Show 9 quoted lines

>Hi,
>
>On Wed, 13 Jun 2007, Bill Lear wrote:
>
>> I wonder, also, if there could be a way to alert users that their 
>> working tree is dirty before all the git pull blather comes out, scaring 
>> their poor little souls?
>
>Well, it's their fault, isn't it?

Yes, it is.  But that's no reason not to try to produce a nicer warning.

>> fatal: Entry 'src/netlist/EocCompiler.cc' not uptodate. Cannot merge.
>
>Sorry, this is the first time Git can realize that the dirty working 
>directory conflicts with the changes about to be applied.

Ah, this makes sense. It has to do all the other stuff first and only when it comes across one that won't "fit" does it complain. This makes more sense now...

Bill