On Thu, 7 Feb 2008, Brandon Philips wrote: > On 05:15 Tue 05 Feb 2008, Robert P. J. Day wrote: > > 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. > > Why wouldn't you just use git-reset --hard ? No need to blow everything > away :) i did say "if all else fails". :-) 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
