hardy: git pull errors

[Tim Gardner]

Christian Kujau wrote:
> Hi,
> 
> hope that's not too OT for this list: I try to follow the Hardy kernel via 
> git, but I'm not committing any changes to the tree. Now, I haven't 
> git-pull'ed for a while now and when trying to I keep getting the same 
> message over and over again. How can I "fix conflicts" as git suggests?
> Moving the file out of the way did not help either...
> 
> That's what I tried already:
> 
> $ git clean -d -x
> $ git reset
> $ git reset --hard
> $ git diff
> $ git pull

Try this:

git checkout -f
git clean -f -d
git reset --hard Ubuntu-2.6.24-16.30
git fetch origin
git rebase origin

rtg
-- 
Tim Gardner tim.gardner at canonical.com