From: Linus Torvalds Date: Sun, 04 Feb 2007 10:40:38 GMT Subject: Re: merge doesn't remove files Message-ID: In-Reply-To: <20070204045933.GC16766@spearce.org> On Sat, 3 Feb 2007, Shawn O. Pearce wrote: > > But that tree-ish doesn't have to be the first non-base > argument to merge-recursive, does it? In practice it usually is, > but can I assume it in the code? Yes, the first branch is supposed to be the "current" one. That's the one we compare to the index, and that we should already error out on if the index doesn't match the tree. So yeah, a file should ever be removed only if it existed in the old index (and by implication in the first branch, since otherwise we should have failed the merge as not having a clean tree anyway). Linus