working-with-code.md

Working with Code

Create a branch as child of master (one per user-story)

platform environment:checkout PARENT-BRANCH // checkout parent branch
platform branch CHILD-BRANCH //creates a new branch as child of parent (1 min process)
git commit --allow-empty -m "branch created" // bookmark
git push bitbucket // this push a new commit to bitbucket and you can see changes on bitbucket and platform are linked
git branch -u bitbucket/CHILD-BRANCH // track bitbucket as upstream
platform snapshot:create // just in case you need to revert to a clean branch

Set up required on platform.sh for future merges and pull requests

platform integration:update [PROJECT-ID] --build-pull-requests false
platform integration:update [PROJECT-ID] --fetch-branches true

Merge a branch

After CHILD-BRANCH is created and tested:

• Go to bitbucket and create a pull request
• Approve pull request
• Merge the pull request on bitbucket

On local machine, the following code force deletes a local branch and pushes to bitbucket

git branch -D BRANCHNAME
git push bitbucket --delete BRANCHNAME

Export configuration from local to platform

On local machine

drush cex -y
git add -A
git  commit -m "configuration exported"
platform snapshot:create
git push bitbucket
platform snapshot:create

On local machine with config-merge (testing) **********

drush @drupal.MY-BRANCH config-merge @self --git --branch=export

Troubleshooting

Clean local repo from ignored files

 git clean -df

Clear cache

git rm -r --cached .
git add .
git commit -m ".gitignore is now working"