NEVER COMMIT ON THE SERVER

For version control 372Digital uses Bitbucket.

• Before a Deployment, the DEV branch is used
• During Development the DEV branch is used alongside the STAGING branch
• The MASTER branch is reserved for the live site

Commits Should Be reasonably small only to contain the required code for the single unit of work completed.

To create a new bit bucket repo

1. Head over to https://bitbucket.org/dashboard/overview
2. Click the plus icon
3. Click ‘Repository’
4. Enter an appropriate name, see Project File Management
5. Check ‘This is a private repository’
6. Click ‘Create Repository’

If changes Exist on the Server and don’t exist locally

If something in the server environment changes and there are new/ modified files you may need to test these changes locally.

This could occur due to an automatic update , or somehow the client may have update plugins or WordPress core etc.

To make certain that these changes don’t conflict with our development environment we need to do the following.

1.  SSH into the server
2. Create a new branch [server] if it does not exist
3. Checkout to [server]
4. Stage all changes to the new branch
5. Commit Changes with commit message of ‘ Server Commit’
6. Push Commits to Bit Bucket
7. On your local machine fetch then pull the new branch
8. Checkout to your Working branch DEV
9. Merge changes, resolve conflicts and QA these to ensure everything works as expected.
   1. if these changes do not work as expect roll back, this is why we use version control.