From: Dmitry Torokhov <dtor@insightbb.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <junkio@cox.net>
Subject: Merging on a dirty tree???
Date: Thu, 15 Mar 2007 23:59:53 -0400 [thread overview]
Message-ID: <200703152359.53543.dtor@insightbb.com> (raw)
Hi,
I just tried to pull from Linus' tree into my local tree and it seems
that fast forward was committed even though the tree was dirty:
...
drivers/media/video/cx88/cx88-input.c: needs update
drivers/media/video/ir-kbd-i2c.c: needs update
drivers/media/video/saa7134/saa7134-input.c: needs update
include/linux/device.h: needs update
include/linux/input.h: needs update
fatal: Entry 'drivers/base/core.c' not uptodate. Cannot merge.
Makefile | 4 +-
arch/i386/kernel/nmi.c | 8 ----
arch/x86_64/kernel/nmi.c | 5 +--
drivers/base/core.c | 29 ++++++++++++++
drivers/hid/hid-core.c | 20 ++++-----
drivers/net/natsemi.c | 58 +++++++++++++++-------------
drivers/net/netxen/netxen_nic.h | 1 +
drivers/net/netxen/netxen_nic_ethtool.c | 1 +
drivers/net/netxen/netxen_nic_hw.c | 5 ++-
drivers/net/netxen/netxen_nic_init.c | 11 ++++-
drivers/net/skge.c | 28 ++++++++-----
drivers/s390/cio/ccwgroup.c | 18 +++++++-
drivers/scsi/scsi_sysfs.c | 14 ++++++-
fs/sysfs/file.c | 64 ++++++++++++++++++++++++++++--
fs/sysfs/inode.c | 10 +++-
include/asm-i386/nmi.h | 2 +-
include/asm-x86_64/nmi.h | 2 +-
include/linux/device.h | 2 +
include/linux/sysfs.h | 9 ++++
19 files changed, 211 insertions(+), 80 deletions(-)
[dtor@anvil work]$ git --version
git version 1.5.0.3.438.gc49b2
It used to refuse merge if there were conflicts...
--
Dmitry
next reply other threads:[~2007-03-16 4:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-16 3:59 Dmitry Torokhov [this message]
2007-03-16 10:46 ` Merging on a dirty tree??? Santi Béjar
2007-03-16 10:53 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200703152359.53543.dtor@insightbb.com \
--to=dtor@insightbb.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.