Short Version What changes (if any) can be made within the /wp-admin that would result in WP Engine committing a change to my project's git history?
Longer Version I'm migrating a Wordpress blog over to WP Engine from Pantheon. We're versioning Wordpress core and have a few plugins stored in our version control as well.
I can install a new plugin to the production environment if I do the following:
- In my local environment, add the source code to
wp-content/plugins
- Make a git commit and push it to the production branch (set to
git@git.wpengine.com:staging/thenameofmysite.git
)
When I do this, the plugin is accessible from production. However, when I go the other way around, I experience unexpected behavior.
From within /wp-admin, I install a new plugin (eg ninjaforms). If I open an SFTP shell into my instance, I can see the plugin files living next to the ones I added via git. Success!
However, when I try to do a git pull origin master
or git pull origin staging
I don't receive any new files. This is unfortunate because it means that someone could add a plugin that I'm unable to pull down (which makes my local dev environment out of sync with production) or that I need to add SFTP pulls into my git workflow.
The WP Engine documentation (taken from https://wpengine.com/git/#toc_6) suggests that I shouldn't be experiencing this behavior:
WP Engine will continue to manage core updates for you. For those who version and deploy WordPress core with git, we will automatically create a new commit point and push the update back to the current branch of your repository. This will require a git pull/merge to update and sync to your local repository. If you don’t version WP core then you’ll get the upgrades as a part of our existing upgrade process.
Does anyone know when, and under what circumstances, a commit of this kind of commit might be created? The git pull
process seems relatively well documented, but I can't seem to find any resources anywhere about the rules governing WP Engine-created pulls, how they handle merge conflicts, etc...