Tileo feature/raster

[apercas]

I guess we can check this soon and create a docker image for beta after merging

[apercas]

I just discovered that if we solve this conflicts we create the 'ghost merge commit' we saw before because internally GitHub is merging tileo into tileo-feature/raster before letting us go the other way around.

[ivanprado]

Nice. So the final protocol for our flow is:

• One branch for each feature (some of them would it be long lived, like rasters)
• Branches merged into tileo-develop branch to deploy to beta. Pull request can be done to collaborate, but automatic github merge should not be used as it does two ways merge (target branch would also be merged into feature branch, which is not desired). git merge --no-ff should be used instead.
• tileo-develop merged into tileo when deploying new versions to production. Create a tag for each deployed version.

When getting new changes from CartoDB repo:

• Pull from upstream CartoDB repo to update master and the rest of Carto related branches and tags
• Merge of changes into tileo-develop and feature branches that needs it.
• These changes will reach tileo branch when merging with tileo-develop for a deployment.