QuestionQ111

Continuous Integration Techniques

Universal Containers (UC) is building a custom Lightning Platform application. The following development tools are in use: the Force.com IDE for application development, Git and a Git repository for source control, and the Force.com Migration Tool to update sandboxes from source control.

UC’s current branching strategy uses two main branches:

  1. Master
  2. Develop

It also uses three supporting branches:

  1. Feature
  2. Release
  3. Hotfix

Assume the branching strategy runs in parallel as follows:

Feature | Develop | Release | Hotfix | Master

What recommended development-practice strategy should Developers use?

  • A Developers work off of the Feature branch, which is pulled from the Master branch, and the Feature branch is then merged with the Develop branch.
  • B Developers work off of the Feature branch, which is pulled from the Develop branch, and the Feature branch is then merged with the Develop branch.
  • C Developers work off of the Feature branch, which is pulled from the Release branch, and the Feature branch is then merged with the Develop branch.
  • D Developers work off of the Feature branch, which is pulled from the Develop branch, and the Feature branch is then merged with the Hotfix branch.
Explanation

In the Gitflow workflow, each feature branch is created from the Develop branch, which is the integration branch for ongoing development. After the feature is complete, it is merged back into Develop. Master is reserved for production-ready releases, while Release and Hotfix branches serve release preparation and urgent production fixes.

Learn more

Community Discussion

No comments yet. Be the first to start the discussion!