last git update of parisc-2.6.git failed again to merge???

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.

The history is non-linear, because I rebased it:

git fetch origin; git reset --hard origin/master

while on your master branch should resolve it. But be careful, it will remove any of your local changes.

Kyle,

Ah ok it's not yet another of my mistakes lol

Cool, I will try on my other clone (there I use http protocol and a b180 and in this figure it takes long hours before the clone action is finished. And unfortunately I don't have enough disk space to convert this tree in a hg or recent bzr one, that would probably help me to be convienced that git is well the more effcient vcs, ozn)

Well I just manage few external patch with quilt on another copy of your tree, I so not worry ;<)

Tx again for advises,

	J.