On the list of things I can never remember how to do when I need to do it: resolving tree conflicts in Subversion. Tree conflicts happen to me often when I am working in a branch of the main code and I merge from trunk to keep things current. I can't explain why they happen a lot in the system I work with (perhaps I should find out?), but I can fix them easily when they come up. But I always have to look up the simple command to do it. Well here is how it is done...
