Terminology
Git terms
Section titled “Git terms”Here are some common words related to Git that you will see used in various places around CloudCannon.
GitHub
Section titled “GitHub”GitHub is a platform for Git where you can store your code online, track changes, and collaborate with others. It is the platform that Minderoo uses for all of our sites.
Branch
Section titled “Branch”A branch is a separate version of the website where you can safely make changes without affecting the main version, or any other versions. Branches in CloudCannon are called Sites.
Commit
Section titled “Commit”A Git commit is a saved snapshot of your website changes at a specific point in time, usually when you have finished working on something.
Commit message
Section titled “Commit message”When you make a commit, you will be asked to include a short description that explains what you changed and why, helping others understand your updates later.
Syncing is to update the website so the versions in GitHub and CloudCannon match, uploading your changes and downloading others’ changes at the same time.
Downloading the latest changes from the shared website to your branch so you’re working with the most up-to-date version.
Pull request
Section titled “Pull request”Creating a pull request is to ask for your changes to be reviewed and approved before they are added to the staging or production versions of the website. You may have permissions to publish your own pull requests, or you may need someone else to approve it for you.
Merging is combining changes from one branch of a website into another, typically bringing your changes into the staging or production versions of the website.
Conflict
Section titled “Conflict”When you try to merge two sets of changes and they clash – for example, you and someone else have edited the same line of the same story – Git asks you to choose which one to use or lets you combine them manually.
General terms
Section titled “General terms”These are some words you might see in relation to our websites, particularly around CloudCannon.
A website build is the process of turning the source files (like templates and content) into a finished website ready to be published. You will not see your changes updated until the build has finished and deployed, which usually takes 2-4 minutes.
Production
Section titled “Production”The live version of our websites that real users see on the internet.
Staging
Section titled “Staging”The private, test versions of our websites used to preview changes before they go live.