Re: git rebase: unexpected conflict

From: Michael S. Tsirkin <mst@mellanox.co.il>
Date: Feb 7, 2007, 20:05 UTC
Message-ID: <20070207200508.GE12140@mellanox.co.il>
In-Reply-To: <7vr6t17ohb.fsf@assigned-by-dhcp.cox.net>

Show 37 quoted lines

> Quoting Junio C Hamano <junkio@cox.net>:
> Subject: Re: git rebase: unexpected conflict
> 
> "Michael S. Tsirkin" <mst@mellanox.co.il> writes:
> 
> > When you have resolved this problem run "git rebase --continue".
> > If you would prefer to skip this patch, instead run "git rebase --skip".
> > To restore the original branch and stop rebasing run "git rebase --abort".
> > --------------------------
> >
> > Sure enough, there are conflicts in drivers/mtd/nand/Kconfig:
> >
> > <<<<<<< HEAD:drivers/mtd/nand/Kconfig
> > config MTD_NAND_CAFE
> >        tristate "NAND support for OLPC CAFÉ chip"
> >        depends on PCI
> >        help
> >          Use NAND flash attached to the CAFÉ chip designed for the $100
> >          laptop.
> > =======
> > config MTD_NAND_AT91
> >         bool "Support for NAND Flash / SmartMedia on AT91"
> >         depends on MTD_NAND && ARCH_AT91
> >         help
> >           Enables support for NAND Flash / Smart Media Card interface
> >           on Atmel AT91 processors.
> >>>>>>>> [MTD] NAND: AT91 NAND driver:drivers/mtd/nand/Kconfig
> >
> > But I don't really understand where do the conflicts come from:
> > The patch I skipped (9b3bfe5696aa417d38ce903eb345a03d65743dd2)
> > only touched the file drivers/infiniband/core/addr.c,
> > so why can't rebase replay all of the changes?
> 
> That is because David Woodhouse has an evil merge at
> c45aa055c32b488fc3fd73c760df372b09acf69a.
> 
> Running "git show" on that commit would tell you the story.

Sorry about being dense. What's evil there? There seems to have been a merge, and a conflict was resolved.

mst@mst-lt:~/scm/linux-2.6$ git show c45aa055c32b488fc3fd73c760df372b09acf69a
commit c45aa055c32b488fc3fd73c760df372b09acf69a
Merge: 784f4d5... 8dd851d...
Author: David Woodhouse <dwmw2@infradead.org>
Date:   Sun Oct 22 02:17:05 2006 +0100

    Merge git://git.infradead.org/~dwmw2/cafe-2.6

    Conflicts:

        drivers/mtd/nand/Kconfig

diff --cc drivers/mtd/nand/Kconfig index b4b1656,5e97e63..564f79d

--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@@ -219,6 -219,6 +219,13 @@@ config MTD_NAND_SHARPS
        tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)"
        depends on MTD_NAND && ARCH_PXA

++config MTD_NAND_CAFE
++       tristate "NAND support for OLPC CAFÉ chip"
++       depends on PCI
++       help
++       Use NAND flash attached to the CAFÉ chip designed for the $100
++       laptop.
++
  config MTD_NAND_CS553X
        tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)"
        depends on MTD_NAND && X86_32 && (X86_PC || X86_GENERICARCH)

-- 
MST