(Warning: I'm a subversion user and haven't worked with git at all)

I've followed these steps successfully with 0.3.23 (or maybe it was 22). In the last step I actually did 'git diff master..sipa/showwallet |patch -p1', then 'cd src' and 'make bitcoind' as usual. Funny having to patch things, but I guess that's how git does things.

Now, what should I do to update to 0.3.24 without starting from scratch? A quick google revealed 'git pull' but that failed with "Your local changes to 'contrib/gitian.yml' would be overwritten by merge.  Aborting". Must I revert those changes (the applied patch, I suppose) before doing 'git pull'?

For now I just removed everything and started over, but I'd like to be cleaner next time. Already running "0.3.25-beta" .