Which Source Code Management System Suits My Needs Best? Git or SVN? How do you diff excel spreadsheets?

I am currently looking at the efficiency and ease of 开发者_如何转开发our companies source code / resource management tools..

For the last couple of months i have been using Git to manage all of my web development code and images.. and for me it works fine.

However some of my colleges aren't entirely comfortable using the command line.

our company works with both mac's and PC's and we heavily work with visual studio and MS VBA. we also work quite a lot with Photoshop CS4

I have been considering moving our company onto subversion.

My Reasoning is:

• There's some great mac gui clients (i.e. Versions)
• Theres a great Photoshop Plugin (Pixelnovel)
• we work fairly centeralised

My Questions are:

• Which SCM would suit our needs best?
• Are there any tools available to Diff the VBA code in excel macros
• Are there any SVN Clients As Slick as Versions available for windows?

Thanks a Lot

Daniel

I think Subversion would be very well suited. There's a good windows client, TortoiseSVN which is very simple, the server is simple to set up on Windows, Mac or Linux, and it fits with your centralised model. I wouldn't suggest using git as the client GUIs aren't as mature and it's a lot more complex model to get your head around for less technical users.

Obviously, it depends on what you want to do.

One way to look at it: If you want to check in larger binaries, I have found that svn works better. IF you want to merge text files, git is better.

If you have the money @ericgorr is right, Perforce is much nicer to work with then svn.

If you can afford it, I would suggest Perforce. The P4V GUI client is excellent. They support Mac, Windows, LINUX, & Unix

You can make Git work to how you like. See why people are having issues and address them. Ease of use means putting a ceiling on productivity. Git's the most powerful thing out there for VCS.

Careful if you plan on merging work if you're not using Git...