Anyone using git?

[DannyGSmith]

Portland Wordcamp had a talk about using git, and I missed it. The last version control I used was sccs, and that was a long time ago. I need to pick one and start using it. Amazon has a couple of books, but I am more of a visual learner. What are y'all using and why, tradeoffs etc.

[andreasnrb]

I'm using Git. I don't know much about tradeoffs but I find the developing process to suite me.
One trade off with using Git is that you have to checkout the complete repository you cant just checkout one folder.
Also not all tools for using Git is that good. I used to use Git with Eclipse and sometimes it messed up the checkins and there became out of sync conflicts and complete mess. I'm now using TortoiseGIT and havent had a problem since.

[DannyGSmith]

Thanks, what I need it for, is I have one big site in production, and we are making changes in a test environment, and need to roll the changes into it. It may be an issue not being able to checkout a folder, but on the other hand, that is the only files that are being updated anyway so it may be a wash. Thanks for the feedback.

[andrea_r]

What about svn?

[DannyGSmith]

SVN would work to, I like the idea of git, that is being distributed. Having to setup an svn server on a local machine would be more of a hassle, but doable. What is attracting me to git, is the distributed nature, but I need to read some more to get a handle of it. I did find a good video by O'Reily at http://oreillynet.com/pub/e/1394 At http://progit.org/ there is a creative commons addition of the Pro Git book as well.

[Otto]

I tried git. I found it confusing and difficult to use. The merge system in particular makes no damn sense to me at all. I watched the tutorials, and I understand what they're doing. I just don't see the point of doing all that extra work and having local repos and such. It's baffling to me why anybody would want to go to all that trouble.

SVN just works better for my style.

[DannyGSmith]

I tried git. I found it confusing and difficult to use. The merge system in particular makes no damn sense to me at all. I watched the tutorials, and I understand what they're doing. I just don't see the point of doing all that extra work and having local repos and such. It's baffling to me why anybody would want to go to all that trouble.

SVN just works better for my style.

Did you setup a local server, or just use one of the free ones?

[Otto]

Did you setup a local server, or just use one of the free ones?

All the projects I really commit to have their own SVN's or patch systems. I don't really use version control locally. Never had a need.

However, if I wanted to, I could just setup an SVN server on my existing Apache testing installation. I use that webserver for lots of things. Just install mod_dav, mod_dav_svn, etc...