Best Practice to update

[17twenty]

I've had the kernel checked out for a while and built from it and performed a git pull on this repo to keep things up to date
I've rerun the patch.sh and it has left things in quite a bad state. Lots of unmerged files and errors.

What's the correct way to update the repo and kernel without making things sad?

[koenkooi]

try a 'git reset --hard' before doing a git pull