The entire server for the Skin Deep website.

• Trellis server (./trellis)
• Bedrock wordpress installation (./site)
• Sage-based Skin deep theme (./site/web/app/themes/sd-theme)

As established by the above frameworks, dependencies are managed using standard tooling:

• Bedrock and Sage PHP dependencies managed using composer
• Sage node dependencies are managed using yarn

Updates to Trellis, Bedrock and Sage are managed following the process outlined by hooverlunch.

Trellis, Bedrock and Sage were all added as remotes, then merged as subtrees with the following commands:

git subtree add --prefix=trellis trellis master --squash
git subtree add --prefix=site bedrock master --squash
git subtree add --prefix=site/web/app/themes/sd-theme sage master --squash

Updating these components can be achieved with the following commands:

git subtree pull --prefix=trellis trellis master --squash
git subtree pull --prefix=site bedrock master --squash
git subtree pull --prefix=site/web/app/themes/sd-theme sage master --squash

Syncing of the wordpress database and uploads is performed using trellis-database-uploads-migration.

A remote db-uploads-migration was added, and a branch tracking master created:

git branch db-uploads-migration/master db-uploads-migration

Updates to the remote can be merged in with:

git checkout db-uploads-migration
git pull --rebase
git checkout master
git merge --squash -s subtree -Xsubtree=trellis/ --no-commit db-uploads-migration --allow-unrelated-histories