Second article about git history and merge-based workflows: examples + links