Salto’s branching strategy enables effective configuration management and seamless deployments using Git. Here’s an overview of how it works:
Branch Per Environment in a Unified Repository:
Each release pipeline (e.g., Dev → UAT → Prod) is linked to a single Git repository. Within this repository, each environment is connected to its own dedicated branch, which always holds the up-to-date configuration of that environment. Learn more
Deployment Pull Requests:
When deployment PRs are enabled, Salto creates a feature branch for every new deployment. Learn more
This branch originates from the environment branch, and a pull request is automatically generated to merge it back.
Alternatively, users can manually create a pull request with the desired changes and then trigger a Salto deployment from it, offering flexibility in the deployment process. Learn more
Promotion to the Next Environment:
During promotion, a new feature branch is created from the next environment’s branch.
Salto translates the promoted changes into commits and pushes them to this feature branch.
A pull request is created and merged into the next environment’s branch, ensuring consistency.
Conflict Resolution:
Conflicts may occur during deployments or promotions. Salto’s conflict resolution tool helps resolve these efficiently. Lean more