Sorry to be so ignorant, but I just updated to 2.6.19 using: git-checkout master git-pull ... sound/usb/usbaudio.c | 3 usr/Makefile | 2 92 files changed, 888 insertions(+), 371 deletions(-) create mode 100644 arch/mips/kernel/topology.c create mode 100644 arch/um/os-Linux/execvp.c create mode 100644 include/asm-arm/mach/udc_pxa2xx.h All seemed to go I then moved back to my branch and pulled from master to my branch: git-checkout ace git-pull . master But that failed: Trying really trivial in-index merge... fatal: Merge requires file-level merging Nope. Merging HEAD with 0215ffb08ce99e2bb59eca114a99499a4d06e704 Merging: d7083db038fb98266e331a7f96198ec35a12367a A partial fix BUG 061124 (crashing when 1ms interrrupts). 0215ffb08ce99e2bb59eca114a99499a4d06e704 Linux 2.6.19 found 1 common ancestor(s): 1abbfb412b1610ec3a7ec0164108cee01191d9f5 [PATCH] x86_64: fix bad page state in process 'swapper' Auto-merging kernel/fork.c CONFLICT (content): Merge conflict in kernel/fork.c Auto-merging kernel/spinlock.c CONFLICT (content): Merge conflict in kernel/spinlock.c Automatic merge failed; fix conflicts and then commit the result. I then searched the net for how to resolve conflicts, seems you should start by doing a git-diff, so I did and I get this: diff --cc kernel/fork.c index d74b4a5,8cdd3e7..0000000 --- a/kernel/fork.c +++ b/kernel/fork.c diff --cc kernel/spinlock.c index f4d1718,2c6c2bf..0000000 --- a/kernel/spinlock.c +++ b/kernel/spinlock.c And git-status shows: # On branch refs/heads/ace # # Updated but not checked in: # (will commit) # # modified: Documentation/rtc.txt # modified: Makefile # modified: arch/arm/configs/assabet_defconfig # modified: arch/arm/configs/cerfcube_defconfig ...... # modified: sound/usb/usbaudio.c # modified: usr/Makefile # # # Changed but not updated: # (use git-update-index to mark for commit) # # unmerged: kernel/fork.c # modified: kernel/fork.c # unmerged: kernel/spinlock.c # modified: kernel/spinlock.c # So what have I done wrong? Did the pull complete and I just need to resolve this or do I need to redo the git-pull? Thanks, Wink Saville - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html