Given a Customer Scenario, Explain How Source Control Branching/versioning/merging Can Be Used and Recommend Appropriate Strategies. DEVELOPMENT-LIFECYCLE-AND-DEPLOYMENT-ARCHITECT Practice Questions (Page 4)

Questions 16–20

1. 16expert · hard

   A Salesforce ISV has a managed package with customers on versions 1.0, 2.0, and 3.0. They need to provide security patches to all three versions. They have a small team and want to minimize the number of branches they maintain. What is the most efficient strategy?

   • ACreate a permanent branch for each version and maintain all patches on those branches.
   • BUse a single maintenance branch for all versions and apply patches conditionally.
   • CApply all patches to main and tag the main branch after each patch.
   • DCreate a maintenance branch for each version only when a patch is needed, and tag the patch release.
   Reveal Solution Discussion Select an answer first
2. 17foundation · easy

   What is a merge conflict in source control?

   • AA situation where two branches have diverged and cannot be merged automatically
   • BA situation where the repository is corrupted
   • CA situation where a branch has no commits
   • DA situation where a developer forgets to commit their changes
   Reveal Solution Discussion Select an answer first
4. 18expert · hard

   A Salesforce ISV maintains a managed package with a major release every six months. They have customers on the previous two major versions who receive security patches. The team is small (5 developers) and wants to minimize branching overhead while still meeting their patch obligations. They also need to demonstrate to auditors which code version was deployed to each customer. What is the most efficient strategy?

   • AUse a single release branch and overwrite it with each new major version, tagging the final commit.
   • BUse trunk-based development, tag each release, and create a maintenance branch from each tag only when a patch is needed.
   • CApply all patches directly to main and tag the main branch after each patch.
   • DCreate a permanent branch for each major version and maintain all patches on those branches indefinitely.
   Reveal Solution Discussion Select an answer first
5. 19foundation · easy

   In Salesforce DX, what is the relationship between source control branches and scratch orgs?

   • AScratch orgs are only created from the main branch
   • BScratch orgs are created from a specific branch to test the code in that branch
   • CScratch orgs replace source control
   • DScratch orgs are stored in source control
   Reveal Solution Discussion Select an answer first
6. 20application · medium

   A Salesforce team has three developers working on three independent features. They all create feature branches from main. Each developer creates a scratch org from their branch to test. After testing, they all merge their branches to main. What is the best way to ensure the merged code works together?

   • ACreate a scratch org from one developer's branch and manually add the other features.
   • BMerge all branches at the same time and deploy directly to production.
   • CHave each developer test their feature in their own scratch org and rely on that testing.
   • DCreate a new scratch org from main after all merges and run the full test suite.
   Reveal Solution Discussion Select an answer first