Short introduction to branching and merging with git