Re: Please undo "Use git-merge instead of git-resolve in git-pull"

From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Sep 22, 2005, 01:46 UTC
Message-ID: <46a038f905092118464b98e149@mail.gmail.com>
In-Reply-To: <20050921.172849.103555057.davem@davemloft.net>

On 9/22/05, David S. Miller <davem@davemloft.net> wrote:

Show 11 quoted lines

> From: Linus Torvalds <torvalds@osdl.org>
> > I often have local changes in my tree that I don't want to commit but that
> > I'm testing out. Havign them interfere with merging other peoples work
> > would mean that I'd have to have a totally separate tree for that, which I
> > could do, but I'm much much happier not having to.
>
> You know, I personally was unaware that this was supported until now.
> I have been always reverting local debugging changes in order to merge
> other people's work in, then reapply the debugging changes afterwards.
>
> I guess I won't have to do that any more. :-)

Using Cogito, we've found a couple of cases where merging on a dirty tree messed things up. The local changes were lost after the merge.

I didn't bother to investigate further, because I didn't know whether it was supported "formally", or meant to be supported for long. Instead, I added a check in cg-merge that refuses to run on a dirty tree.

I guess I'll take that out, and try and debug any future sightings of the problem...

martin