Re: pull into dirty working tree

From: Alex Riesen <raa.lkml@gmail.com>
Date: Jun 13, 2007, 20:47 UTC
Message-ID: <20070613204711.GC3412@steel.home>
In-Reply-To: <86645r1wh8.fsf@blue.stonehenge.com>

Randal L. Schwartz, Wed, Jun 13, 2007 21:32:35 +0200:

Show 6 quoted lines

> Alex> Wont work for new files (not yet known to git) which conflict with the
> Alex> same names from origin. Your method will not put them anywhere and
> Alex> their presence will break git-rebase. You _must_ do a merge.
> 
> So I missed git-add for those.  Then it'll work.  I guess I implied that the
> git-commit initial step should capture all of the "interesting" state.

No, it wont. What files are you going to add? All, but *.o? All, but *.log? What if user hasn't setup .gitignore yet? What if he meant to add an ignored file anyway?

> git-rebase *will* do the merge.  It must. :)

It won't merge anything which isn't known to git. Now, I come to think about it, no existing merge method will help you here (and very likely it shouldn't).

It is actually much simplier doing things right: all this stashing people keep talking about.