( I personally use the command line under Cygwin for some operations, but the team has made it clear they need a GUI and we're going with this one.) Answers should work with this tool, not propose replacements. We're using Tortoise Git because we used Tortoise SVN before. The team is using Tortoise Git on Windows.

What changes can I make to how we are using the tools to make a shared, active master less error-prone until we can switch to doing development on branches? (He has not been able to tell me exactly what he did, and because he's using a GUI I can't just inspect his shell history.)ДЄs the most-proficient Git user (read: I've used it before, though not for anything super-complicated), I'm the person setting policy, teaching the tools, and cleaning up messes. Yesterday somebody clobbered recent changes - somehow - with a merge gone wrong, which I think was the merge that Git does when you pull and have outstanding changes. Sometimes people commit but fail to push, or they pull and get conflicts with their pending local changes. We're seeing a lot more hiccups now than when we were using SVN, some of which are caused by Git's two-stage model (local and remote). Meanwhile, everybody is working on master. As part of the move to Git we've agreed to fix that, but we can't do it just yet (waiting on build changes that will allow builds from arbitrary branches). In SVN, everybody worked on master - a model I've always hated, but I wasn't able to bring about that change.

Our documentation team of about ten people recently moved from SVN to Git.

Git and tortoisegit