From: Linus Torvalds Date: Thu, 22 Sep 2005 02:10:08 GMT Subject: Re: Please undo "Use git-merge instead of git-resolve in git-pull" Message-ID: In-Reply-To: <46a038f905092118464b98e149@mail.gmail.com> On Thu, 22 Sep 2005, Martin Langhoff wrote: > > 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. Hmm. I merge a ton of stuff, and as mentioned, I probably have a dirty tree at least half the time. I don't think I've seen a problem yet. But cogito at least _used_ to have some special logic for moving patches forward. git-resolve-script never had that - it only ever did the per-file three-way merge, and refused to touch dirty state except for the "everything stays the same" case. Oh. I'm looking at the current cg-merge thing, and I think I see the problem: it's doing git-checkout-index -f -u -a at the end. That's not only unnecessary, since it uses the "-u" flag to "git-read-tree", but it will force an overwrite of the working tree, and is thus actively incorrect. Pasky? Linus