On Tue, 5 Feb 2008, Peter Teoh wrote: > After I issued "git pull" I got the following conflicts: > > remote: Counting objects: 3463, done. > remote: Compressing objects: 100% (459/459), done. > Indexing 2612 objects... > remote: Total 2612 (delta 2236), reused 2528 (delta 2152) > 100% (2612/2612) done > Resolving 2236 deltas... > 100% (2236/2236) done > 718 objects were added to complete this thin pack. > * refs/remotes/origin/master: fast forward to branch 'master' of > git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 > old..new: 795d45b..5329cf8 > * refs/remotes/origin/mm: forcing update to non-fast forward branch > 'mm' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 > old...new: b7e245f...1c207e8 > Removed Documentation/smp.txt > Removed arch/arm/Kconfig.instrumentation > Removed arch/arm/mach-ixp4xx/dsmg600-power.c > Removed arch/arm/mach-ixp4xx/nas100d-power.c > Removed arch/arm/mach-ixp4xx/nslu2-power.c > Auto-merged arch/x86/Kconfig > Auto-merged arch/x86/mm/ioremap.c > CONFLICT (content): Merge conflict in arch/x86/mm/ioremap.c > Removed drivers/net/mipsnet.h > Removed drivers/pci/pcie/aspm.c > Removed include/linux/aspm.h > Removed kernel/Kconfig.instrumentation > Automatic merge failed; fix conflicts and then commit the result. > > I really don't know what happens? Please help me, thanks. i'm currently up to date WRT git and i haven't seen that kind of merge conflict. if all else fails, just remove your entire working copy (leaving the .git directory where it is) with: $ rm -rf * do the pull, then recheck everything out with: $ git checkout -f that might be brute force, but it should work. if you *still* have a conflict, then you must have made some changes and committed them or something similar. rday -- ======================================================================== Robert P. J. Day Linux Consulting, Training and Annoying Kernel Pedantry Waterloo, Ontario, CANADA Home page: http://crashcourse.ca Fedora Cookbook: http://crashcourse.ca/wiki/index.php/Fedora_Cookbook ======================================================================== -- To unsubscribe from this list: send an email with "unsubscribe kernelnewbies" to ecartis@xxxxxxxxxxxx Please read the FAQ at http://kernelnewbies.org/FAQ
