Have been using Subversion for some time but am looking to move to something that handles merges with a little less pain.
I refactored a whole lot of code, moved tons of stuff around and merging this was a pain!
Came across this tutorial by Joel Spolsky. He writes really well as regular readers of his blog will know. Nothing wrong with a bit of humour and it's not often that I LOL reading tutorials :-)
There's also a "Red Bean" book here.