As has been said, Git was built knowing that branching is an important task - and so creating and using branches is easy, fast, and flexible.
(I used to work on a large project that used SVN, and I had half a dozen checked-out copies because I often worked on multiple things and switching branches with SVN was so slow.) I very much recommend the branching strategy Jonah linked to ( http://nvie.com/posts/a-successful-git-branching-model/ ), it might seem like overkill, but it really does make sense. I'm also going to repeat a couple of things that have already been said, because I think it's beneficial to say them in a different way. :) Git allows you to move all uncommitted changes to a temporary branch, and to retrieve again later, using "git stash" command. Also, if you want to, you can convert stashes into real branches (with a single command). See http://www.kernel.org/pub/software/scm/git/docs/git-stash.html for info. Git allows changes to be staged in parts with "git add --patch <filename>" - this will step you through a list of changes in that file, and allows you to indicate if each change should be staged or not, as well as splitting each one into smaller changes. I do this all the time, when I've got multiple unrelated changed that each deserve independent commit messages. Once you understand what's happening, it's not hard to handle. (Unless the changes are not unrelated, but that's a different problem.) Details at http://kernel.org/pub/software/scm/git/docs/git-add.html Also worth pointing out, aside from those man pages, there's a number of good documentation sources for git: http://www.kernel.org/pub/software/scm/git/docs/user-manual.html http://progit.org/book (also available as a physical book) http://book.git-scm.com ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~| Order the Adobe Coldfusion Anthology now! http://www.amazon.com/Adobe-Coldfusion-Anthology/dp/1430272155/?tag=houseoffusion Archive: http://www.houseoffusion.com/groups/cf-talk/message.cfm/messageid:346378 Subscription: http://www.houseoffusion.com/groups/cf-talk/subscribe.cfm Unsubscribe: http://www.houseoffusion.com/groups/cf-talk/unsubscribe.cfm
