From: J. Bruce Fields Date: Tue, 21 Mar 2006 19:39:24 GMT Subject: Re: Bad merging with stgit or git Message-ID: <20060321193924.GD14579@fieldses.org> In-Reply-To: <1142969653.4749.109.camel@praia> On Tue, Mar 21, 2006 at 04:34:13PM -0300, Mauro Carvalho Chehab wrote: > It shouldn't have any conflicts here for Linus, since those patches came > from his tree. What do you mean by "those patches came from his tree"? If you're actually cherry-picking patches from his tree and applying them to yours, then you're not reproducing the same commits he has--you're just creating new commits that happen to have nearly identical content. --b.