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 1)

Questions 1–5

1. 1expert · hard

   A Salesforce team is considering moving from GitFlow to trunk-based development. Their main concern is that they have several long-running features that cannot be released until complete. They also need to support hotfixes to the current production release. What is the best way to address their concern?

   • AKeep long-lived feature branches in trunk-based development, merging only when complete.
   • BUse a single main branch and have developers commit directly, relying on code review.
   • CUse feature flags to hide incomplete features and keep main always releasable, with short-lived feature branches.
   • DUse GitFlow but shorten the release cycle to weekly.
   Reveal Solution Discussion Select an answer first
2. 2foundation · easy

   What is the primary benefit of using short-lived feature branches for parallel development?

   • AThey eliminate the need for code reviews
   • BThey allow developers to work without committing
   • CThey reduce the risk of large, difficult merges
   • DThey automatically deploy to production
   Reveal Solution Discussion Select an answer first
4. 3foundation · easy

   When a merge conflict occurs, what is the typical next step for a developer?

   • AManually edit the conflicting files to resolve the differences
   • BRevert the merge and never merge again
   • CAutomatically accept all changes from the remote branch
   • DDelete the branch and start over
   Reveal Solution Discussion Select an answer first
5. 4application · medium

   A company has two Scrum teams working on the same Salesforce org. Team A owns the Sales Cloud features, and Team B owns the Service Cloud features. They share a common codebase and release together every sprint. They want to minimize merge conflicts and integration issues. What is the best branching approach?

   • AEach team has its own main branch, and they merge into a shared release branch only at release time.
   • BEach team works on its own long-lived feature branch, merging to main only at the end of the sprint.
   • CTeam A works on main, and Team B works on a separate branch that is never merged.
   • DBoth teams work on short-lived feature branches off main, merging frequently (daily or every few days).
   Reveal Solution Discussion Select an answer first
6. 5application · medium

   A healthcare company requires that all changes to their Salesforce org be traceable to a work item and that no change can be deployed without passing automated tests. They use Git with Salesforce DX. What is the best way to enforce this?

   • AUse a shared branch and have the QA team test the final release.
   • BRequire pull requests to reference a work item and run automated tests in CI before merging.
   • CRequire developers to add the work item number in their commit message and run tests locally.
   • DAllow developers to merge to main directly, but require them to add a comment with the work item number.
   Reveal Solution Discussion Select an answer first