Hi Uwe, On Wed, 7 Jul 2010 08:47:35 +0200 Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> wrote: > > > OK, this is only the third time I have seen git mismerge something > > automaitcally. :-( > I can reproduce that here[1]. Is this a bug in git? Can somebody explain? > I expected a merge conflict or only a single occurence of devices[] I suspect it is a matter of not enough context (or the context looks the same after applying one of the updates) for git to realise that both trees are trying to add the same code in the same place. There is a conflict, but the recursive merge decides that each tree is adding something different and so include them both (or some such :-)). Most of the time, git gets this right. > > I have fixed this up in today's linux-next (and will continue to do so > > while necessary). > How do you remember this. By "hand" or do you have some automatism for > such things? In this case, my scripts automatically apply a patch to the merge commit. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpp3mM7fAGnp.pgp
Description: PGP signature