From: Joel Soete <soete.joel@scarlet.be>
To: Kyle McMartin <kyle@mcmartin.ca>,
linux-parisc <linux-parisc@vger.kernel.org>
Subject: last git update of parisc-2.6.git failed again to merge???
Date: Sun, 07 Sep 2008 11:51:26 +0000 [thread overview]
Message-ID: <48C3C03E.2050405@scarlet.be> (raw)
Hello Kyle,
Just fyi, my latest 'git pull' (this Sep 4 2008 around 8h gmt) of your tree
<git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git> (again) failed to merge ;_(
From git://git.eu.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
+ 07f3b22...2c41408 master -> origin/master (forced update)
warning: too many files, skipping inexact rename detection
CONFLICT (rename/delete): Renamed include/asm-parisc/pdc.h->arch/parisc/include/asm/pdc.h in HEAD and deleted in
2c41408cff1c81a5fe6980862f00e370a129c302
CONFLICT (rename/delete): Renamed include/asm-parisc/ropes.h->arch/parisc/include/asm/ropes.h in HEAD and deleted in
2c41408cff1c81a5fe6980862f00e370a129c302
CONFLICT (rename/delete): Renamed include/asm-parisc/unistd.h->arch/parisc/include/asm/unistd.h in HEAD and deleted in
2c41408cff1c81a5fe6980862f00e370a129c302
Removed Documentation/cli-sti-removal.txt
Removed Documentation/filesystems/configfs/configfs_example.c
Removed Documentation/powerpc/SBC8260_memory_mapping.txt
[snip]
Removed include/asm-sh/ubc.h
Removed include/asm-sh/watchdog.h
Removed include/linux/harrier_defs.h
Removed include/media/audiochip.h
Automatic merge failed; fix conflicts and then commit the result.
This was done with:
# git --version
git version 1.5.6.5
Any idea of what would I do better then re-clone tree
# git clone git://git.eu.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git parisc-2.6
Initialized empty Git repository in /Develop/parisc-linux/Kyle/parisc-2.6/.git/
remote: Counting objects: 895134, done.
remote: Compressing objects: 100% (147414/147414), done.
remote: Total 895134 (delta 746373), reused 895072 (delta 746330)
Receiving objects: 100% (895134/895134), 213.04 MiB | 94 KiB/s, done.
Resolving deltas: 100% (746373/746373), done.
Checking out files: 100% (24348/24348), done.
Tia,
J.
PS: Nothing I can find with google, help me to fix this issue.
next reply other threads:[~2008-09-07 11:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-07 11:51 Joel Soete [this message]
2008-09-07 16:25 ` last git update of parisc-2.6.git failed again to merge??? Kyle McMartin
2008-09-08 21:16 ` Joel Soete
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=48C3C03E.2050405@scarlet.be \
--to=soete.joel@scarlet.be \
--cc=kyle@mcmartin.ca \
--cc=linux-parisc@vger.kernel.org \
/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.