First blog post on merging with git