5.7Common QA Scenarios for Cherry-Pick

Test Fix Needed on Multiple Branches

You fixed a flaky test on develop, but the same test is flaky on the release/2.4 branch.

# Find the commit hash of your fix on develop
git log --oneline develop -- tests/payment.spec.ts
# Output: abc123f fix(payment): stabilize test by awaiting API response

# Apply it to the release branch
git checkout release/2.4
git cherry-pick abc123f

Hotfix Verification

A hotfix was committed to main for a production issue. You need to verify it on a test branch without merging all of main.

git checkout test/regression-suite
git cherry-pick <hotfix-commit-hash>
# Run regression tests including the fix
npm run test:regression

Pulling Test Infrastructure Into a Feature Branch

The test infrastructure was updated on develop (e.g., new page object helpers), but your feature branch was created before that update.

git checkout feature/my-tests
git cherry-pick <infrastructure-commit-hash>
# Now you have the new helpers without merging everything else from develop