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 :)
Cheers,
Brandon
--
To unsubscribe from this list: send an email with
"unsubscribe kernelnewbies" to [EMAIL PROTECTED]
Please read the FAQ at http://kernelnewbies.org/FAQ
