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

Questions 6–10

1. 6application · medium

   Two developers on a Salesforce DX project are working on separate features. Developer A modifies a custom object's field, and Developer B modifies the same field's help text. They both create scratch orgs from the same main branch. When Developer B merges their feature branch, they get a merge conflict. What is the most appropriate way to resolve this conflict?

   • ADiscard Developer B's changes and re-apply them after Developer A's merge is complete.
   • BManually edit the metadata file to combine both changes, keeping the field definition from A and the help text from B.
   • CHave Developer B overwrite the file with their version, since the help text is the only meaningful change.
   • DUse the Salesforce CLI to automatically merge the metadata, as it can resolve all conflicts without manual intervention.
   Reveal Solution Discussion Select an answer first
2. 7foundation · easy

   A team wants a branching model where all development happens on a single branch and releases are created by tagging specific commits. Which branching model does this describe?

   • ATrunk-based development
   • BGitFlow
   • CRelease branching
   • DForking workflow
   Reveal Solution Discussion Select an answer first
4. 8foundation · easy

   Which branching model is best suited for a project that requires strict release management with separate branches for features, releases, and hotfixes?

   • AForking workflow
   • BGitFlow
   • CTrunk-based development
   • DSingle-branch workflow
   Reveal Solution Discussion Select an answer first
5. 9foundation · easy

   Which source control feature is most appropriate for recording that a specific commit was deployed to production as version 2024.1?

   • ATag
   • BMerge
   • CBranch
   • DCommit
   Reveal Solution Discussion Select an answer first
6. 10application · medium

   A company releases a Salesforce managed package quarterly. They need to provide patches to customers on the previous release while developing the next one. They also must be able to prove which exact source code version was deployed to a specific customer's org for audit purposes. What is the best approach?

   • AUse only tags without branches, and create a new tag for each patch by cherry-picking commits from main.
   • BCreate a release branch for each quarterly version, tag the release commit, and create a maintenance branch from the tag for patches.
   • CTag the main branch at each release and continue all development on main, applying patches directly to main.
   • DKeep a single branch named 'release' and overwrite it with each new version, tagging the final commit.
   Reveal Solution Discussion Select an answer first