The branch that you want to merge changes into
The visualization that shows you where a branch came from and how it relates to other branches
A branch that has a parent branch; a child branch can also be a parent branch
Conflicts arise during the merge process when the base branch and the source branch each changed the same thing (in different ways) since the last time the two branches were in sync
Conflict resolution is the process of resolving conflicts. The conflict resolution window organizes conflicts by page and gives you the option to resolve all conflicts in favor of one branch on a page-by-page basis.
Apps on the higher plans can have one or more custom branches
To deploy a branch is to push changes to Live. Only the Main branch and the hotfix branches can be deployed to Live.
The development environment contains Main, any custom branches, and hotfix branch
Environments contain branches. There are two environments: live and development. The environment is defined by the database that it uses (i.e., the live environment uses the live database, while the development environment uses the development database).
The hotfix branch is the only branch that can branch off of Live. Only one hotfix branch can exist at a time. While a hotfix branch exists, Main cannot be deployed to Live. Hotfix is available on higher plans.
When two branches are in sync, there are no conflicts that would be generated from merging the two branches
Live is the version of your app that lives on the internet for users to interact with
The live environment contains Live
All apps have a Main branch. Main is the only branch that can be deployed to Live (aside from hotfix). Main sits at the very top of the branch tree hierarc
The process of integrating changes from the source branch into the base branch
A branch that has child branches branching off of it; a parent branch can also be a child branch
To resolve conflicts that arise during the merge process, you must select which change to favor
To restore is to return to a past version of a branch by using the savepoint feature or by entering a custom date/time
Savepoints are automatically created in the base branch when you deploy to Live, start a merge, finish a merge, cancel a merge, or right before you restore your branch.
Custom savepoints are savepoints that you can manually create at any time.
savepoint retention window
An app’s savepoint retention window dictates how far back you can restore any one of your branches
Refers to the branch that is the source of changes that you want to merge into the base branch
To sync two branches is to merge them for the purposes of bringing changes in Live or Main into the base branch
To create a branch off of another branch
The system for tracking and managing changes to your app.