Question 130
During an operational security assessment at a public-sector technology agency, the team documents this issue: Hotfixes are cherry-picked into several branches with inconsistent outcomes. The affected delivery process supports citizen applications and reusable infrastructure; accountability and service availability depend on controlled delivery. Select TWO: one corrective action and one test that confirms its effectiveness. (Select TWO.)
Explanation
Correct Answers
Correct corrective action. Use trunk-based development with small, short-lived feature branches and automated validation, employing feature flags for unfinished behavior. The action targets the recorded failure (Hotfixes are cherry-picked into several branches with inconsistent outcomes), and is intended to reduce the corresponding risk: Long-lived integration branches accumulate merge risk and delay verified fixes to main.
Correct verification. Two independent features merge behind flags without visible unfinished behavior and can be released separately. The measurement or controlled test provides evidence for the issue (Hotfixes are cherry-picked into several branches with inconsistent outcomes) and complements the selected corrective action rather than simply repeating a recommendation.
Incorrect Answers
A production hotfix is tagged, reviewed, merged into the release branch and reconciled back to main without losing the original fix. It is not the complementary risk control for trunk based development integration.
Require pull-request review, current required status checks and ruleset protections for the protected default branch, limiting bypass authority. This does not supply the required trunk based development integration action-and-control pair.
Configure Azure Repos branch policies for minimum reviewer count, linked work items and build validation on critical branches. The paired controls concern trunk based development integration, not that measure.