drush
drush
merge
merge
ignore themes managed in git