To actually reap the benefits of git, there are some small changes that have to be made in the development cycle that any of our old team members won't be used to. I'll try to write a small "Getting started/switching from SVN" guide soon.
For an extremely condensed version:
-
Checkout with:
git clone https://[email protected]:l1j/classic.git -
Switch to the appropriate branch (probably dev).
git checkout dev -
Make a change, then commit (commit isn't like an SVN commit. It only commits it to your own local "branch").
git commit -am "Fix some stuff" -
Push the change upstream (this is where it acts like an SVN commit and pushes it to the main repo)
git push
One slight change in a dev's normal "process", that I believe will help a ton, are the branches. For example, if you're working on a branch named "thebes":
-
checkout -
git checkout master -
git branch thebes(create your own local branch to work on a specific feature) -
do your work, when you feel your finished, move to next step
-
git commit -a(commit changes to your local "thebes" branch) -
git checkout(switch to the global development branch) -
git merge thebes(merge in any changes from your thebes branch) -
git commit -a -
git push
I know that seems like many more steps than our old SVN system, but it starts to come naturally very quickly, and the benefits are enormous. Some of the commands have the same name as the old SVN commands, but work a little differently. That can cause some confusion but again you get used to it very quickly..