Sync Changes from Upstream

This documentation is intended for maintainers in order to sync changes from upstream and then deploy a new release.

Sync changes from upstream

NOTE: If you have not setup your workspace to pull from upstream, see Initial Setup to Sync from Upstream.

• Before pulling from upstream, make sure the working copy is up to date from the fork:

git pull

• Create a temporary branch to pull upstream changes into:

git checkout -b tmp

• Pull the upstream changes

git pull upstream trunk

• Now, pull changes from the upstream repo

git pull upstream tmp

• Resolve any conflicts using git add

• Commit the changes and push

git commit -am "Merging from upstream"
git push origin tmp

• CircleCI will now build and test the images.