I've used both git and svn--probably a bit more time using git on the command line. I wouldn't want to say that git is the best choice for every system, but I'v

I've used both git and svn--probably a bit more time using git on the command line. I wouldn't want to say that git is the best choice for every system, but I've had more hair pulling with svn. Specifically, merging a commit from a branch into trunk got messed up. I did find svn pretty painless when used with Eclipse however. The things about git that make me like it better are that the branching and merging are easy and the distributed nature of the system. If your development process doesn't exploit the features of git, then svn would be a reasonable choice. EDIT: Another key thing I like about git is that repos can be nested. The parent repo simply ignores the child repos. This is something where I get a lot of benefit.