A better way to merge code
blog.trunk.io