If you have the choice, don’t. Pick one and stick with it. My personal preference at this time is git because it facilitates smaller commits — but who cares what I prefer, you’re probably tied to a versioning system based on what someone long before you decided to use.<\/p>\n
I for one am tied to svn for doing deploys, but since I’m gaga over git and doing things in the open, I want to use git on a day to day basis and just use svn for deploys. <\/p>\n
This sucks, but if you’re going to do it, you shouldn’t be a douche and add your .git directory to svn. That was my first attempt, even though I knew it was bad, I wanted to see the performance hit on svn firsthand I guess.<\/p>\n
So I have the deployment related files in svn, so git is free of any environment specific files, like database configs.<\/p>\n
So I do all development in git with “.svn” in the .gitignore. That part is easy. Getting svn to ignore git is a little more annoying<\/a>, especially if you have multiple submodules. So when you’re ready, you add everything to svn, then rm the .git files. It’s better to rm them with the –keep-local flag<\/a>.<\/p>\n