My presentation/workshop from the Mahara UK 2011 technical day.
This gives a quick insight into Git, what git is, some of the useful features of git are, and how it can be used in Mahara.
29. Branch, Branch, Branch!!! Branches are cool Branches don’t suck in Git (yes I know they do in subversion) git checkout –b <branchname> git branch git branch --all
30. Rebases and Merges Rebase rewrites history Merge combines histories Rebasing changes the parent of a commit Don’t use rebase if you’re going to step on someone elses toes git rebase origin/master git rebase gerrit/master git merge my_local_branch