In response to this weeks question about Git, you might want to check out this video of Linus Torvalds talking about Git while over at Google. I found it quite informative and decided to use Git for my stuff after that. It's not so much that Git makes merging harder but that it keeps people having some revision control whenever they're coding.
http://youtube.com/watch?v=4XpnKHJAok8
GIT from the man himself
Moderators: snarkout, Patrick, dann