merging generated github and spree extension gitignore