Testing various different git merge strategies