[This is off topic, but my entire reason for struggling with git is to help test patches to b43, so I beg the list's pardon for asking here.]
I'm trying to maintain a git repository of wireless-testing, to test Michael's patches to b43. The initial git-clone went fine, and I tested several patches successfully. I'm currently having a great deal of trouble trying to update my local repository via git-pull. I've spent a while with the various git manpages (git-pull, git-clean, git-checkout, git-reset, git-tutorial, etc.), as well as with the wireless.kernel.org git-guide and with google, but I just can't seem to grok basic git operation. All I want to do is dump any changes I've made to the code, and then pull in an updated version, but I just can't make git do that. I am getting all kinds of errors; google turns up other instances of them, but no straightforward solution. My current state: $ git-status # On branch master # Untracked files: # (use "git add <file>..." to include in what will be committed) # # arch/alpha/include/ # arch/arm/plat-orion/include/ # arch/h8300/include/ # debian/ # drivers/usb/musb/ nothing added to commit but untracked files present (use "git add" to track) $ git-pull error: Untracked working tree file 'arch/alpha/include/asm/8253pit.h' would be overwritten by merge. fatal: merging of trees b09605fa2c229f91c55eb8eeec11b8c30afdad38 and aee0332143df67e34f69da0c6fdf1a631daec065 failed $ git-clean -f Not removing arch/alpha/include/ Not removing arch/arm/plat-orion/include/ Not removing arch/h8300/include/ Not removing debian/ Not removing drivers/usb/musb/ $ git-clean -fx Not removing .tmp_versions/ Not removing arch/alpha/include/ Not removing arch/arm/plat-orion/include/ Not removing arch/h8300/include/ Not removing arch/i386/ Not removing debian/ Not removing drivers/usb/musb/ Not removing include/config/ $ git-checkout -f Your branch and the tracked remote branch 'origin/master' have diverged, and respectively have 15591 and 906 different commit(s) each. I may be missing something obvious, and I admit that I don't have a great understanding of git concepts, but can someone point me in the right direction for fixing my repository? Celejar -- mailmin.sourceforge.net - remote access via secure (OpenPGP) email ssuds.sourceforge.net - A Simple Sudoku Solver and Generator _______________________________________________ Bcm43xx-dev mailing list [email protected] https://lists.berlios.de/mailman/listinfo/bcm43xx-dev
